瀏覽代碼

no message

FengChaoYu 2 月之前
父節點
當前提交
bbd94fded0
共有 1 個文件被更改,包括 12 次插入4 次删除
  1. 12 4
      src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

+ 12 - 4
src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -171,21 +171,27 @@ public class AdminUserLogic {
     @Transactional
     public void save(AdminUserAddReqBean adminUser, HttpServletRequest request) throws RemoteServiceException {
 
+        boolean isAdd = true;
+        if (StringUtils.isNotBlank(adminUser.getAdminUserId())) {
+            isAdd = false;
+        }
+
         AdminUserCom admin = commonLogic.getAdminUser(request);
 
         if (StringUtils.isEmpty(adminUser.getUserName())
-                || (StringUtils.isBlank(adminUser.getAdminUserId()) && StringUtils.isEmpty(adminUser.getPassword()))) {
+                || (isAdd && StringUtils.isEmpty(adminUser.getPassword()))) {
             throw new RemoteServiceException("参数错误");
         }
         Integer count = adminUserService.lambdaQuery()
-                .ne(StringUtils.isNotBlank(adminUser.getAdminUserId()), AdminUser::getAdminUserId, adminUser.getAdminUserId())
+                .ne(!isAdd, AdminUser::getAdminUserId, adminUser.getAdminUserId())
                 .eq(AdminUser::getUserName, adminUser.getUserName())
                 .count();
         if (count > 0) {
             throw new RemoteServiceException("帐号已被注册");
         }
 
-        if (StringUtils.isBlank(adminUser.getAdminUserId())) {
+        if (isAdd) {
+            // 新增账号产生id
             adminUser.setAdminUserId(IdWorker.getIdStr());
         }
 
@@ -200,7 +206,9 @@ public class AdminUserLogic {
         // 数据权限
         this.dataPermissionsHandle(adminUser, adminUser.getPermissions());
 
-        adminUser.setPassword(MD5Utils.md5(adminUser.getPassword()));
+        if (isAdd || StringUtils.isNotBlank(adminUser.getPassword())) {
+            adminUser.setPassword(MD5Utils.md5(adminUser.getPassword()));
+        }
 
         adminUserService.saveOrUpdate(adminUser);
     }