新增用户时不添加项目合同段

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -191,42 +191,44 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         if (userCount > 0L && Func.isEmpty(user.getId())) {
             throw new ServiceException(StringUtil.format("当前用户 [{}] 已存在!", user.getAccount()));
         }
-        //获取Role信息
-        if (user.getProjectAndUserList().size() <= 0) {
-            throw new ServiceException("请关联项目合同段用户类型信息");
-        }
-        StringBuffer stringBuffer = new StringBuffer();
-        Set<String> set = new TreeSet<>();
-        List<SaveUserInfoByProjectDTO> projectAndUserList = user.getProjectAndUserList();
-        projectAndUserList.forEach(i -> {
-            String roleId = i.getRoleId();
-            set.add(roleId);
-        });
-        for (String s : set) {
-            stringBuffer.append(s).append(",");
-        }
-        user.setRoleId(String.valueOf(stringBuffer.deleteCharAt(stringBuffer.length() - 1)));
-        //user.setUserType(1); //用户平台-WEB
-        user.setName(user.getRealName());
+            //获取Role信息
+//        if (user.getProjectAndUserList().size() <= 0) {
+//            throw new ServiceException("请关联项目合同段用户类型信息");
+//        }
+//        StringBuffer stringBuffer = new StringBuffer();
+//        Set<String> set = new TreeSet<>();
+//        List<SaveUserInfoByProjectDTO> projectAndUserList = user.getProjectAndUserList();
+//        projectAndUserList.forEach(i -> {
+//            String roleId = i.getRoleId();
+//            set.add(roleId);
+//        });
+//        for (String s : set) {
+//            stringBuffer.append(s).append(",");
+//        }
+//        user.setRoleId(String.valueOf(stringBuffer.deleteCharAt(stringBuffer.length() - 1)));
+//        //user.setUserType(1); //用户平台-WEB
+//        user.setName(user.getRealName());
         boolean b1 = save(user);
-
-        if (b1) {
-            //绑定用户与部门关系
-            boolean b = submitUserDept(user);
-            if (b) {
-                //比较
-                if (checkContractId(user.getProjectAndUserList())) {
-                    throw new ServiceException("一个合同段只允许分配一个用户类型信息,请重新选择");
-                }
-                //新增用户绑定项目合同段
-                user.getProjectAndUserList().forEach((i) -> {
-                    i.setUserId(String.valueOf(user.getId()));
-                });
-                contractClient.saveUserInfoByProjectThree(user.getProjectAndUserList());
-                return true;
-            }
-        }
-        throw new ServiceException("操作失败");
+        boolean b = submitUserDept(user);
+        return b1;
+//
+//        if (b1) {
+//            //绑定用户与部门关系
+//
+//            if (b) {
+//                //比较
+//                if (checkContractId(user.getProjectAndUserList())) {
+//                    throw new ServiceException("一个合同段只允许分配一个用户类型信息,请重新选择");
+//                }
+//                //新增用户绑定项目合同段
+//                user.getProjectAndUserList().forEach((i) -> {
+//                    i.setUserId(String.valueOf(user.getId()));
+//                });
+//                contractClient.saveUserInfoByProjectThree(user.getProjectAndUserList());
+//                return true;
+//            }
+//        }
+//        throw new ServiceException("操作失败");
     }
 
     /**