From 471f908f88371cc9199bab9e5115e24065a3a02c Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 12 Mar 2025 10:44:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=9A?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=B2=97=E4=BD=8D=E5=85=A5=E5=BA=93=E5=92=8C?=
 =?UTF-8?q?=E5=B2=97=E4=BD=8D=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/user/AdminUserServiceImpl.java  | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java
index 2083d7526..7d45bdbf1 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/user/AdminUserServiceImpl.java
@@ -153,8 +153,7 @@ public class AdminUserServiceImpl implements AdminUserService {
         }, organId);
 
         // 校验正确性
-        validateUserForCreateOrUpdate(null, createReqVO.getMobile(),
-                createReqVO.getEmail(), createReqVO.getDeptId(), createReqVO.getPostIds(), null, organId);
+        validateUserForCreateOrUpdate(null, createReqVO.getMobile(), createReqVO.getDeptId(), null, organId);
         // 插入用户
         AdminUserDO user = BeanUtils.toBean(createReqVO, AdminUserDO.class);
         // 改造：手机号直接当做用户名
@@ -184,8 +183,7 @@ public class AdminUserServiceImpl implements AdminUserService {
         // 不允许关闭自身状态
         checkCurrentWhenOperateStatus(userId, updateReqVO.getStatus());
         // 校验正确性
-        AdminUserDO currUserDO = validateUserForCreateOrUpdate(userId, mobile,
-                updateReqVO.getEmail(), updateReqVO.getDeptId(), updateReqVO.getPostIds(), null, organId);
+        AdminUserDO currUserDO = validateUserForCreateOrUpdate(userId, mobile, updateReqVO.getDeptId(), null, organId);
         // 更新用户
         AdminUserDO updateObj = BeanUtils.toBean(updateReqVO, AdminUserDO.class);
 
@@ -535,8 +533,7 @@ public class AdminUserServiceImpl implements AdminUserService {
         return deptIds;
     }
 
-    private AdminUserDO validateUserForCreateOrUpdate(Long id, String username, String email,
-                                                      Long deptId, Set<Long> postIds, String password, Long organId) {
+    private AdminUserDO validateUserForCreateOrUpdate(Long id, String username, Long deptId, String password, Long organId) {
         // 校验用户的密码是否符合规则
         if (password != null) {
             validatePassword(password);
@@ -550,8 +547,6 @@ public class AdminUserServiceImpl implements AdminUserService {
             // 校验部门处于开启状态
             deptService.validDept(deptId);
         }
-        // 校验岗位处于开启状态
-        postService.validatePostList(postIds);
         return adminUserDO;
     }
 
@@ -688,8 +683,7 @@ public class AdminUserServiceImpl implements AdminUserService {
         importUsers.forEach(importUser -> {
             // 校验，判断是否有不符合的原因
             try {
-                validateUserForCreateOrUpdate(null, null, importUser.getEmail(),
-                        importUser.getDeptId(), null, null, organId);
+                validateUserForCreateOrUpdate(null, null, importUser.getDeptId(), null, organId);
             } catch (ServiceException ex) {
                 respVO.getFailureUsernames().put(importUser.getUsername(), ex.getMessage());
                 return;