Commit 3c0606995321b9ef933c88bea4b515a89ee3b024
1 parent
fc118dc6
用户管理页面 库区编辑显示优化
Showing
3 changed files
with
11 additions
and
11 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
| @@ -172,7 +172,7 @@ public class SysUserController { | @@ -172,7 +172,7 @@ public class SysUserController { | ||
| 172 | Result<SysUser> result = new Result<SysUser>(); | 172 | Result<SysUser> result = new Result<SysUser>(); |
| 173 | String selectedRoles = jsonObject.getString("selectedRoles"); | 173 | String selectedRoles = jsonObject.getString("selectedRoles"); |
| 174 | String selectedWarehouse = jsonObject.getString("selectedWarehouse"); | 174 | String selectedWarehouse = jsonObject.getString("selectedWarehouse"); |
| 175 | - String selectedZoneCode = jsonObject.getString("selectedZoneCode"); | 175 | + String zoneCode = jsonObject.getString("zoneCode"); |
| 176 | String selectedDeparts = jsonObject.getString("selecteddeparts"); | 176 | String selectedDeparts = jsonObject.getString("selecteddeparts"); |
| 177 | try { | 177 | try { |
| 178 | SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class); | 178 | SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class); |
| @@ -187,7 +187,7 @@ public class SysUserController { | @@ -187,7 +187,7 @@ public class SysUserController { | ||
| 187 | throw new ServiceException("仓库不能为空"); | 187 | throw new ServiceException("仓库不能为空"); |
| 188 | } | 188 | } |
| 189 | // 保存用户走一个service 保证事务 | 189 | // 保存用户走一个service 保证事务 |
| 190 | - sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedWarehouse, selectedZoneCode); | 190 | + sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedWarehouse, zoneCode); |
| 191 | result.success("添加成功！"); | 191 | result.success("添加成功！"); |
| 192 | } catch (Exception e) { | 192 | } catch (Exception e) { |
| 193 | log.error(e.getMessage(), e); | 193 | log.error(e.getMessage(), e); |
| @@ -214,7 +214,7 @@ public class SysUserController { | @@ -214,7 +214,7 @@ public class SysUserController { | ||
| 214 | user.setPassword(sysUser.getPassword()); | 214 | user.setPassword(sysUser.getPassword()); |
| 215 | String roles = jsonObject.getString("selectedRoles"); | 215 | String roles = jsonObject.getString("selectedRoles"); |
| 216 | String selectedWarehouse = jsonObject.getString("selectedWarehouse"); | 216 | String selectedWarehouse = jsonObject.getString("selectedWarehouse"); |
| 217 | - String selectedZoneCode = jsonObject.getString("selectedZoneCode"); | 217 | + String zoneCode = jsonObject.getString("zoneCode"); |
| 218 | String departs = jsonObject.getString("selecteddeparts"); | 218 | String departs = jsonObject.getString("selecteddeparts"); |
| 219 | if (oConvertUtils.isEmpty(departs)) { | 219 | if (oConvertUtils.isEmpty(departs)) { |
| 220 | // vue3.0前端只传递了departIds | 220 | // vue3.0前端只传递了departIds |
| @@ -224,7 +224,7 @@ public class SysUserController { | @@ -224,7 +224,7 @@ public class SysUserController { | ||
| 224 | throw new ServiceException("仓库不能为空"); | 224 | throw new ServiceException("仓库不能为空"); |
| 225 | } | 225 | } |
| 226 | // 修改用户走一个service 保证事务 | 226 | // 修改用户走一个service 保证事务 |
| 227 | - sysUserService.editUser(user, roles, departs, selectedWarehouse, selectedZoneCode); | 227 | + sysUserService.editUser(user, roles, departs, selectedWarehouse, zoneCode); |
| 228 | result.success("修改成功!"); | 228 | result.success("修改成功!"); |
| 229 | } | 229 | } |
| 230 | } catch (Exception e) { | 230 | } catch (Exception e) { |
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
| @@ -231,7 +231,7 @@ public interface ISysUserService extends IService<SysUser> { | @@ -231,7 +231,7 @@ public interface ISysUserService extends IService<SysUser> { | ||
| 231 | * @param selectedRoles 选择的角色id，多个以逗号隔开 | 231 | * @param selectedRoles 选择的角色id，多个以逗号隔开 |
| 232 | * @param selectedDeparts 选择的部门id，多个以逗号隔开 | 232 | * @param selectedDeparts 选择的部门id，多个以逗号隔开 |
| 233 | */ | 233 | */ |
| 234 | - void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String selectedZoneCode); | 234 | + void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String zoneCode); |
| 235 | 235 | ||
| 236 | /** | 236 | /** |
| 237 | * 编辑用户 | 237 | * 编辑用户 |
| @@ -239,7 +239,7 @@ public interface ISysUserService extends IService<SysUser> { | @@ -239,7 +239,7 @@ public interface ISysUserService extends IService<SysUser> { | ||
| 239 | * @param roles 选择的角色id，多个以逗号隔开 | 239 | * @param roles 选择的角色id，多个以逗号隔开 |
| 240 | * @param departs 选择的部门id，多个以逗号隔开 | 240 | * @param departs 选择的部门id，多个以逗号隔开 |
| 241 | */ | 241 | */ |
| 242 | - void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String selectedZoneCode); | 242 | + void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String zoneCode); |
| 243 | 243 | ||
| 244 | /** userId转为username */ | 244 | /** userId转为username */ |
| 245 | List<String> userIdToUsername(Collection<String> userIdList); | 245 | List<String> userIdToUsername(Collection<String> userIdList); |
huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
| @@ -489,7 +489,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl | @@ -489,7 +489,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl | ||
| 489 | 489 | ||
| 490 | @Override | 490 | @Override |
| 491 | @Transactional(rollbackFor = Exception.class) | 491 | @Transactional(rollbackFor = Exception.class) |
| 492 | - public void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String selectedZoneCode) { | 492 | + public void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String zoneCode) { |
| 493 | // step.1 保存用户 | 493 | // step.1 保存用户 |
| 494 | this.save(user); | 494 | this.save(user); |
| 495 | // step.2 保存角色 | 495 | // step.2 保存角色 |
| @@ -523,7 +523,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl | @@ -523,7 +523,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl | ||
| 523 | 523 | ||
| 524 | SysUser sysUser = new SysUser(); | 524 | SysUser sysUser = new SysUser(); |
| 525 | sysUser.setId(user.getId()); | 525 | sysUser.setId(user.getId()); |
| 526 | - sysUser.setZoneCode(selectedZoneCode); | 526 | + sysUser.setZoneCode(zoneCode); |
| 527 | if (!sysUserService.updateById(sysUser)) { | 527 | if (!sysUserService.updateById(sysUser)) { |
| 528 | throw new JeecgBootException("更新用户库区失败"); | 528 | throw new JeecgBootException("更新用户库区失败"); |
| 529 | } | 529 | } |
| @@ -533,7 +533,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl | @@ -533,7 +533,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl | ||
| 533 | @Override | 533 | @Override |
| 534 | @Transactional(rollbackFor = Exception.class) | 534 | @Transactional(rollbackFor = Exception.class) |
| 535 | @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true) | 535 | @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true) |
| 536 | - public void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String selectedZoneCode) { | 536 | + public void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String zoneCode) { |
| 537 | // step.1 修改用户基础信息 | 537 | // step.1 修改用户基础信息 |
| 538 | this.updateById(user); | 538 | this.updateById(user); |
| 539 | // step.2 修改角色 | 539 | // step.2 修改角色 |
| @@ -604,10 +604,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl | @@ -604,10 +604,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl | ||
| 604 | 604 | ||
| 605 | SysUser sysUser = new SysUser(); | 605 | SysUser sysUser = new SysUser(); |
| 606 | sysUser.setId(user.getId()); | 606 | sysUser.setId(user.getId()); |
| 607 | - if (StringUtils.isEmpty(selectedZoneCode)) { | 607 | + if (StringUtils.isEmpty(zoneCode)) { |
| 608 | sysUser.setZoneCode(QuantityConstant.EMPTY_STRING); | 608 | sysUser.setZoneCode(QuantityConstant.EMPTY_STRING); |
| 609 | } else { | 609 | } else { |
| 610 | - sysUser.setZoneCode(selectedZoneCode); | 610 | + sysUser.setZoneCode(zoneCode); |
| 611 | } | 611 | } |
| 612 | if (!sysUserService.updateById(sysUser)) { | 612 | if (!sysUserService.updateById(sysUser)) { |
| 613 | throw new JeecgBootException("更新用户库区失败"); | 613 | throw new JeecgBootException("更新用户库区失败"); |