canrd-outside / order-erp · Commits

Commit 3ff114fd4616c499ba795c21fddce2fe4fdd1938

Authored by qdlgxiemaosheng
1 parent b0af8742
build: skipped

fixbug

Inline Side-by-side
Showing 2 changed files with 27 additions and 2 deletions
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
  View file @3ff114f
@@ -176,11 +176,12 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser @@ -176,11 +176,12 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
176 */ 176 */
177 @Override 177 @Override
178 public ServerResult add(AdminUserVO adminUserVO) { 178 public ServerResult add(AdminUserVO adminUserVO) {
179 - //todo 校验  
180 if (Objects.nonNull(adminUserVO.getId())) { 179 if (Objects.nonNull(adminUserVO.getId())) {
181 adminUserVO.setId(null); 180 adminUserVO.setId(null);
182 } 181 }
183 AdminUserDO adminUserDo = BeanUtil.copyProperties(adminUserVO, AdminUserDO.class); 182 AdminUserDO adminUserDo = BeanUtil.copyProperties(adminUserVO, AdminUserDO.class);
  183 + adminUserDo.setUserName(adminUserVO.getNickName());
  184 + adminUserDo.setGender(adminUserVO.getNickName());
184 if (Objects.isNull(adminUserDo.getDeptId())) { 185 if (Objects.isNull(adminUserDo.getDeptId())) {
185 adminUserDo.setDeptId(1L); 186 adminUserDo.setDeptId(1L);
186 } 187 }
@@ -233,7 +234,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser @@ -233,7 +234,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
233 return ServerResult.fail("id 不能为空"); 234 return ServerResult.fail("id 不能为空");
234 } 235 }
235 AdminUserDO adminUserDo = BeanUtil.copyProperties(adminUserVO, AdminUserDO.class); 236 AdminUserDO adminUserDo = BeanUtil.copyProperties(adminUserVO, AdminUserDO.class);
236 - 237 + adminUserDo.setUserName(adminUserDo.getNickName());
237 updateById(adminUserDo); 238 updateById(adminUserDo);
238 239
239 return ServerResult.success(); 240 return ServerResult.success();
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @3ff114f
@@ -605,6 +605,28 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -605,6 +605,28 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
605 } 605 }
606 606
607 /** 607 /**
  608 + *
  609 + * @param updateVO
  610 + */
  611 + private void initOrderId(OrderUpdateVO updateVO){
  612 + if (Objects.nonNull(updateVO.getBaseInfo())) {
  613 + updateVO.getBaseInfo().setId(updateVO.getOrderId());
  614 + }
  615 + if (Objects.nonNull(updateVO.getReportInfo())) {
  616 + updateVO.getReportInfo().setOrderId(updateVO.getOrderId());
  617 + }
  618 + if (Objects.nonNull(updateVO.getInspectionStageInfo())) {
  619 + updateVO.getInspectionStageInfo().setOrderId(updateVO.getOrderId());
  620 + }
  621 + if (Objects.nonNull(updateVO.getProfitAnalysisInfo())) {
  622 + updateVO.getProfitAnalysisInfo().setOrderId(updateVO.getOrderId());
  623 + }
  624 + if (Objects.nonNull(updateVO.getTrackStageInfo())) {
  625 + updateVO.getTrackStageInfo().setOrderId(updateVO.getOrderId());
  626 + }
  627 + }
  628 +
  629 + /**
608 * 修改数据 630 * 修改数据
609 * 631 *
610 * @param updateVO 实例对象 632 * @param updateVO 实例对象
@@ -613,10 +635,12 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O @@ -613,10 +635,12 @@ public class OrderBaseInfoServiceImpl extends ServiceImpl<OrderBaseInfoMapper, O
613 @Override 635 @Override
614 @Transactional 636 @Transactional
615 public ServerResult edit(OrderUpdateVO updateVO) { 637 public ServerResult edit(OrderUpdateVO updateVO) {
  638 +
616 //todo 校验 639 //todo 校验
617 if (Objects.isNull(updateVO.getOrderId())) { 640 if (Objects.isNull(updateVO.getOrderId())) {
618 return ServerResult.fail("id 不能为空"); 641 return ServerResult.fail("id 不能为空");
619 } 642 }
  643 + initOrderId(updateVO);
620 Long userId = dataScope.getLoginUserId(); 644 Long userId = dataScope.getLoginUserId();
621 OrderBaseInfoDO orderBaseInfoDo = getById(updateVO.getOrderId()); 645 OrderBaseInfoDO orderBaseInfoDo = getById(updateVO.getOrderId());
622 if (Objects.isNull(orderBaseInfoDo)) { 646 if (Objects.isNull(orderBaseInfoDo)) {