diff --git a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java index 632037f..1903b66 100644 --- a/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java +++ b/hangtag-module-system/hangtag-module-system-biz/src/main/java/cn/hangtag/module/system/service/user/AdminUserServiceImpl.java @@ -133,10 +133,10 @@ public class AdminUserServiceImpl implements AdminUserService { public void updateUser(UserSaveReqVO updateReqVO) { updateReqVO.setPassword(null); // 特殊:此处不更新密码 updateReqVO.setUsername(updateReqVO.getEmail()); + validateUsernameUnique(updateReqVO.getId(),updateReqVO.getUsername()); // 1. 校验正确性 AdminUserDO oldUser = validateUserForCreateOrUpdate(updateReqVO.getId(), updateReqVO.getUsername(), updateReqVO.getMobile(), updateReqVO.getEmail(), updateReqVO.getDeptId(), updateReqVO.getPostIds()); - // 2.1 更新用户 AdminUserDO updateObj = BeanUtils.toBean(updateReqVO, AdminUserDO.class); userMapper.updateById(updateObj); @@ -292,10 +292,10 @@ public class AdminUserServiceImpl implements AdminUserService { @Override public AdminUserDO getUser(Long id) { AdminUserDO adminUserDO = ADMIN_USERS_CACHE.get(id); - if(FuncUtil.isEmpty(adminUserDO)){ + //if(FuncUtil.isEmpty(adminUserDO)){ adminUserDO = userMapper.selectById(id); - ADMIN_USERS_CACHE.put(id,adminUserDO); - } + // ADMIN_USERS_CACHE.put(id,adminUserDO); + //} return adminUserDO; } diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue index 301064f..7177f1b 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/index.vue @@ -109,11 +109,11 @@ > - - - - - + + + + +