fix:用户修改、新增提示优化

project-interface/src/main/java/com/dituhui/pea/pojo/UserInfo.java

@@ -98,7 +98,7 @@ public class UserInfo {
     /**
     /**
      * 创建人
      * 创建人
      */
      */
-    //private String createdBy;
+    private String createdBy;
     /**
     /**
      * 创建时间
      * 创建时间
      */
      */

project-user/src/main/java/com/dituhui/pea/user/controller/UserController.java

@@ -94,8 +94,7 @@ public class UserController implements IUser {
         if (StringUtils.isBlank(userInfo.getPassword())) {
         if (StringUtils.isBlank(userInfo.getPassword())) {
             return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
             return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
         }
         }
-        userInfo = userService.saveUser(userInfo);
-        return Result.success(userInfo);
+        return userService.saveUser(userInfo);
     }
     }
 
 
     @Override
     @Override
@@ -106,8 +105,7 @@ public class UserController implements IUser {
         if (StringUtils.isBlank(userInfo.getId())) {
         if (StringUtils.isBlank(userInfo.getId())) {
             return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
             return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
         }
         }
-        userInfo = userService.updateUser(userInfo);
-        return Result.success(userInfo);
+        return userService.updateUser(userInfo);
     }
     }
 
 
     @Override
     @Override

project-user/src/main/java/com/dituhui/pea/user/service/UserService.java

@@ -285,16 +285,19 @@ public class UserService {
      * @return
      * @return
      */
      */
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public UserInfo saveUser(UserInfo userInfo) {
+    public Result<UserInfo> saveUser(UserInfo userInfo) {
         // 校验用户信息
         // 校验用户信息
-        checkAccount(userInfo);
+        Result<UserInfo> checkAccount = checkAccount(userInfo);
+        if (null != checkAccount) {
+            return checkAccount;
+        }
         UserEntity userEntity = BeanUtil.copyProperties(userInfo, UserEntity.class);
         UserEntity userEntity = BeanUtil.copyProperties(userInfo, UserEntity.class);
         // 密码MD5加密
         // 密码MD5加密
         userEntity.setPassword(SecureUtil.md5(userInfo.getPassword()));
         userEntity.setPassword(SecureUtil.md5(userInfo.getPassword()));
         // 保存用户信息
         // 保存用户信息
         userEntity = userDao.save(userEntity);
         userEntity = userDao.save(userEntity);
         savaUserRoleAndOrgInfo(userInfo);
         savaUserRoleAndOrgInfo(userInfo);
-        return BeanUtil.copyProperties(userEntity, UserInfo.class);
+        return Result.success(BeanUtil.copyProperties(userEntity, UserInfo.class));
     }
     }
 
 
     /**
     /**
@@ -424,19 +427,22 @@ public class UserService {
      * @return
      * @return
      */
      */
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    public UserInfo updateUser(UserInfo userInfo) {
+    public Result<UserInfo> updateUser(UserInfo userInfo) {
         // 校验用户信息
         // 校验用户信息
-        checkAccount(userInfo);
+        Result<UserInfo> checkAccount = checkAccount(userInfo);
+        if (null != checkAccount) {
+            return checkAccount;
+        }
         // 查询用户信息是否存在
         // 查询用户信息是否存在
         UserEntity userEntity = userDao.findById(userInfo.getId()).orElse(null);
         UserEntity userEntity = userDao.findById(userInfo.getId()).orElse(null);
         if (ObjectUtil.isNull(userEntity)) {
         if (ObjectUtil.isNull(userEntity)) {
-            throw new BusinessException(StatusCodeEnum.USER_DOES_NOT_EXIST);
+            return Result.failed(StatusCodeEnum.USER_DOES_NOT_EXIST, null);
         }
         }
         assembleUpdateUserInfo(userInfo, userEntity);
         assembleUpdateUserInfo(userInfo, userEntity);
         userEntity = userDao.save(userEntity);
         userEntity = userDao.save(userEntity);
         savaUserRoleAndOrgInfo(userInfo);
         savaUserRoleAndOrgInfo(userInfo);
         userInfo = BeanUtil.copyProperties(userEntity, UserInfo.class);
         userInfo = BeanUtil.copyProperties(userEntity, UserInfo.class);
-        return userInfo;
+        return Result.success(userInfo);
     }
     }
 
 
     /**
     /**
@@ -515,33 +521,39 @@ public class UserService {
      *
      *
      * @param userInfo 用户信息
      * @param userInfo 用户信息
      */
      */
-    private void checkAccount(UserInfo userInfo) {
+    private Result<UserInfo> checkAccount(UserInfo userInfo) {
         // 校验账号
         // 校验账号
         if (StringUtils.isNotBlank(userInfo.getAccount())) {
         if (StringUtils.isNotBlank(userInfo.getAccount())) {
             if (checkAccount(userInfo.getAccount(), userInfo.getId())) {
             if (checkAccount(userInfo.getAccount(), userInfo.getId())) {
-                throw new BusinessException(StatusCodeEnum.ACCOUNT_EXISTS);
+                return Result.failed(StatusCodeEnum.ACCOUNT_EXISTS, null);
+                // throw new BusinessException(StatusCodeEnum.ACCOUNT_EXISTS);
             }
             }
         }
         }
         // 校验手机号
         // 校验手机号
         if (StringUtils.isNotBlank(userInfo.getPhone())) {
         if (StringUtils.isNotBlank(userInfo.getPhone())) {
             // 校验手机格式是否正确
             // 校验手机格式是否正确
             if (!Validator.isMobile(userInfo.getPhone())) {
             if (!Validator.isMobile(userInfo.getPhone())) {
-                throw new BusinessException(StatusCodeEnum.COMMON_PARAM_ERROR);
+                return Result.failed(StatusCodeEnum.COMMON_PARAM_ERROR, null);
+                // throw new BusinessException(StatusCodeEnum.COMMON_PARAM_ERROR);
             }
             }
             if (checkPhone(userInfo.getPhone(), userInfo.getId())) {
             if (checkPhone(userInfo.getPhone(), userInfo.getId())) {
-                throw new BusinessException(StatusCodeEnum.MOBILE_NUMBER_EXISTS);
+                return Result.failed(StatusCodeEnum.MOBILE_NUMBER_EXISTS, null);
+                // throw new BusinessException(StatusCodeEnum.MOBILE_NUMBER_EXISTS);
             }
             }
         }
         }
         // 校验邮箱
         // 校验邮箱
         if (StringUtils.isNotBlank(userInfo.getEmail())) {
         if (StringUtils.isNotBlank(userInfo.getEmail())) {
             // 校验邮箱格式是否正确
             // 校验邮箱格式是否正确
             if (!Validator.isEmail(userInfo.getEmail())) {
             if (!Validator.isEmail(userInfo.getEmail())) {
-                throw new BusinessException(StatusCodeEnum.COMMON_PARAM_ERROR);
+                return Result.failed(StatusCodeEnum.COMMON_PARAM_ERROR, null);
+                // throw new BusinessException(StatusCodeEnum.COMMON_PARAM_ERROR);
             }
             }
             if (checkEmail(userInfo.getEmail(), userInfo.getId())) {
             if (checkEmail(userInfo.getEmail(), userInfo.getId())) {
-                throw new BusinessException(StatusCodeEnum.EMAIL_EXISTS);
+                return Result.failed(StatusCodeEnum.EMAIL_EXISTS, null);
+                // throw new BusinessException(StatusCodeEnum.EMAIL_EXISTS);
             }
             }
         }
         }
+        return null;
     }
     }
 
 
     /**
     /**