diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 2317dec..34d67c5 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -172,7 +172,7 @@ public class SysUserController { Result<SysUser> result = new Result<SysUser>(); String selectedRoles = jsonObject.getString("selectedRoles"); String selectedWarehouse = jsonObject.getString("selectedWarehouse"); - String selectedZoneCode = jsonObject.getString("selectedZoneCode"); + String zoneCode = jsonObject.getString("zoneCode"); String selectedDeparts = jsonObject.getString("selecteddeparts"); try { SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class); @@ -187,7 +187,7 @@ public class SysUserController { throw new ServiceException("仓库不能为空"); } // 保存用户走一个service 保证事务 - sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedWarehouse, selectedZoneCode); + sysUserService.saveUser(user, selectedRoles, selectedDeparts, selectedWarehouse, zoneCode); result.success("添加成功!"); } catch (Exception e) { log.error(e.getMessage(), e); @@ -214,7 +214,7 @@ public class SysUserController { user.setPassword(sysUser.getPassword()); String roles = jsonObject.getString("selectedRoles"); String selectedWarehouse = jsonObject.getString("selectedWarehouse"); - String selectedZoneCode = jsonObject.getString("selectedZoneCode"); + String zoneCode = jsonObject.getString("zoneCode"); String departs = jsonObject.getString("selecteddeparts"); if (oConvertUtils.isEmpty(departs)) { // vue3.0前端只传递了departIds @@ -224,7 +224,7 @@ public class SysUserController { throw new ServiceException("仓库不能为空"); } // 修改用户走一个service 保证事务 - sysUserService.editUser(user, roles, departs, selectedWarehouse, selectedZoneCode); + sysUserService.editUser(user, roles, departs, selectedWarehouse, zoneCode); result.success("修改成功!"); } } catch (Exception e) { diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/ISysUserService.java index 390e9db..73c4aca 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/ISysUserService.java +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/ISysUserService.java @@ -231,7 +231,7 @@ public interface ISysUserService extends IService<SysUser> { * @param selectedRoles 选择的角色id,多个以逗号隔开 * @param selectedDeparts 选择的部门id,多个以逗号隔开 */ - void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String selectedZoneCode); + void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String zoneCode); /** * 编辑用户 @@ -239,7 +239,7 @@ public interface ISysUserService extends IService<SysUser> { * @param roles 选择的角色id,多个以逗号隔开 * @param departs 选择的部门id,多个以逗号隔开 */ - void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String selectedZoneCode); + void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String zoneCode); /** userId转为username */ List<String> userIdToUsername(Collection<String> userIdList); diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java index 4f9124d..e1cd381 100644 --- a/huaheng-wms-core/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java +++ b/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 @Override @Transactional(rollbackFor = Exception.class) - public void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String selectedZoneCode) { + public void saveUser(SysUser user, String selectedRoles, String selectedDeparts, String selectedWarehouse, String zoneCode) { // step.1 保存用户 this.save(user); // step.2 保存角色 @@ -523,7 +523,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl SysUser sysUser = new SysUser(); sysUser.setId(user.getId()); - sysUser.setZoneCode(selectedZoneCode); + sysUser.setZoneCode(zoneCode); if (!sysUserService.updateById(sysUser)) { throw new JeecgBootException("更新用户库区失败"); } @@ -533,7 +533,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl @Override @Transactional(rollbackFor = Exception.class) @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true) - public void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String selectedZoneCode) { + public void editUser(SysUser user, String roles, String departs, String selectedWarehouse, String zoneCode) { // step.1 修改用户基础信息 this.updateById(user); // step.2 修改角色 @@ -604,10 +604,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl SysUser sysUser = new SysUser(); sysUser.setId(user.getId()); - if (StringUtils.isEmpty(selectedZoneCode)) { + if (StringUtils.isEmpty(zoneCode)) { sysUser.setZoneCode(QuantityConstant.EMPTY_STRING); } else { - sysUser.setZoneCode(selectedZoneCode); + sysUser.setZoneCode(zoneCode); } if (!sysUserService.updateById(sysUser)) { throw new JeecgBootException("更新用户库区失败");