修改新增用户接口

src/main/java/org/rcisoft/business/system/user/controller/UserController.java

@@ -37,8 +37,8 @@ public class UserController  extends PaginationController<SysUser> {
         SysAdmins sysAdmins = userDto.getSysAdmins();
         SysOwner sysOwner = userDto.getSysOwner();
         SysPrincipal sysPrincipal = userDto.getSysPrincipal();
-        String data = userService.saveUser(sysUser, sysAdmins, sysOwner, sysPrincipal);
-        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR,data);
+        int flag = userService.saveUser(sysUser, sysAdmins, sysOwner, sysPrincipal);
+        return Result.builder(new PersistModel(flag));
     }
 
     @ApiOperation(value = "通过用户ID删除用户")

src/main/java/org/rcisoft/business/system/user/service/UserService.java

@@ -28,7 +28,7 @@ public interface UserService {
       * @param sysPrincipal
       * @return
       */
-     String saveUser(SysUser sysUser, SysAdmins sysAdmins, SysOwner sysOwner,SysPrincipal sysPrincipal);
+     int saveUser(SysUser sysUser, SysAdmins sysAdmins, SysOwner sysOwner,SysPrincipal sysPrincipal);
 
 
      /**  修改系统用户

src/main/java/org/rcisoft/business/system/user/service/impl/UserServiceImpl.java

@@ -74,62 +74,66 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public String saveUser(SysUser sysUser, SysAdmins sysAdmins, SysOwner sysOwner, SysPrincipal sysPrincipal) {
-        String result = "添加失败";
-
-        String userId = IdGen.uuid();
-        sysUser.setUserPwd(passwordEncoder.encode(UserPassWordConstant.PASSWORD));
-        sysUser.setUserId(userId);
-
-        String userTp = sysUser.getUserTp();
-        try {
-            if (UserTpConstant.TP_ADMIN.equals(userTp)) {
-                userRepository.insertSelective(sysUser);
-
-                sysAdmins.setAdminId(IdGen.uuid());
-                sysAdmins.setUserId(userId);
-                adminRepository.insertSelective(sysAdmins);
-
-                RelUserRole relUserRole = new RelUserRole();
-                relUserRole.setUserId(userId);
-                relUserRole.setRoleId(SysRoleConstant.TP_ADMIN_ID);
-                relUserRoleRepository.insertSelective(relUserRole);
-
-                result = "添加管理员成功";
-            }
-            if (UserTpConstant.TP_OWNER.equals(userTp)) {
-                userRepository.insertSelective(sysUser);
+    public int saveUser(SysUser sysUser, SysAdmins sysAdmins, SysOwner sysOwner, SysPrincipal sysPrincipal) {
+        int flag = 0;
+
+        String userNm = sysUser.getUserNm();
+        List<SysUser> flagSysUsers = userRepository.listByUserName(userNm);
+        if (flagSysUsers.size()<0){
+            String userId = IdGen.uuid();
+            sysUser.setUserPwd(passwordEncoder.encode(UserPassWordConstant.PASSWORD));
+            sysUser.setUserId(userId);
+
+            String userTp = sysUser.getUserTp();
+            try {
+                if (UserTpConstant.TP_ADMIN.equals(userTp)) {
+                    userRepository.insertSelective(sysUser);
+
+                    sysAdmins.setAdminId(IdGen.uuid());
+                    sysAdmins.setUserId(userId);
+                    adminRepository.insertSelective(sysAdmins);
+
+                    RelUserRole relUserRole = new RelUserRole();
+                    relUserRole.setUserId(userId);
+                    relUserRole.setRoleId(SysRoleConstant.TP_ADMIN_ID);
+                    relUserRoleRepository.insertSelective(relUserRole);
+
+                    flag = 1;
+                }
+                if (UserTpConstant.TP_OWNER.equals(userTp)) {
+                    userRepository.insertSelective(sysUser);
 
-                sysOwner.setOwnId(IdGen.uuid());
-                sysOwner.setUserId(userId);
-                ownerRepository.insertSelective(sysOwner);
+                    sysOwner.setOwnId(IdGen.uuid());
+                    sysOwner.setUserId(userId);
+                    ownerRepository.insertSelective(sysOwner);
 
-                RelUserRole relUserRole = new RelUserRole();
-                relUserRole.setUserId(userId);
-                relUserRole.setRoleId(SysRoleConstant.TP_OWNER_ID);
-                relUserRoleRepository.insertSelective(relUserRole);
+                    RelUserRole relUserRole = new RelUserRole();
+                    relUserRole.setUserId(userId);
+                    relUserRole.setRoleId(SysRoleConstant.TP_OWNER_ID);
+                    relUserRoleRepository.insertSelective(relUserRole);
 
-                result = "添加业主成功";
-            }
-            if (UserTpConstant.TP_PRINCIPAL.equals(userTp)) {
-                userRepository.insertSelective(sysUser);
+                    flag = 1;
+                }
+                if (UserTpConstant.TP_PRINCIPAL.equals(userTp)) {
+                    userRepository.insertSelective(sysUser);
 
-                sysPrincipal.setPriId(IdGen.uuid());
-                sysPrincipal.setUserId(userId);
-                principalRepository.insertSelective(sysPrincipal);
+                    sysPrincipal.setPriId(IdGen.uuid());
+                    sysPrincipal.setUserId(userId);
+                    principalRepository.insertSelective(sysPrincipal);
 
-                RelUserRole relUserRole = new RelUserRole();
-                relUserRole.setUserId(userId);
-                relUserRole.setRoleId(SysRoleConstant.TP_PRINCIPAL_ID);
-                relUserRoleRepository.insertSelective(relUserRole);
+                    RelUserRole relUserRole = new RelUserRole();
+                    relUserRole.setUserId(userId);
+                    relUserRole.setRoleId(SysRoleConstant.TP_PRINCIPAL_ID);
+                    relUserRoleRepository.insertSelective(relUserRole);
 
-                result = "添加团队负责人成功";
+                    flag = 1;
+                }
+                return flag;
+            } catch (Exception e) {
+                e.printStackTrace();
             }
-            return result;
-        } catch (Exception e) {
-            e.printStackTrace();
         }
-        return "添加失败";
+        return flag;
     }
 
     @Override