commit

src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java

@@ -29,6 +29,7 @@ import io.v.nutz.zhgh.staffmanage.member.constant.MemberChangeType;
 import io.v.nutz.zhgh.staffmanage.member.service.MemberCommonService;
 import io.v.nutz.zhgh.staffmanage.sourcechange.model.SourceChangeConfig;
 import io.v.nutz.zhgh.staffmanage.sourcechange.model.SourceChangeMiddleTable;
+import io.v.nutz.zhgh.staffmanage.specialstaff.model.SpecialStaff;
 import lombok.extern.slf4j.Slf4j;
 import org.nutz.aop.interceptor.ioc.TransAop;
 import org.nutz.dao.Cnd;
@@ -166,6 +167,12 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
             List<String> deleteWelfareMemberUserIds = new CopyOnWriteArrayList<>();
 
 
+            // 查询出工会关系，且是校领导的，这些人不做变动
+            List<SpecialStaff> list = dao().query(SpecialStaff.class,
+                    Cnd.where("personnelRelationUnitId", "=", "DZJF000").and("specialStaffType", "=", "HMC_RELATION"));
+            Set<String> userIds = list.stream().map(SpecialStaff::getUserId).collect(Collectors.toSet());
+
+
             // 创建一个固定大小的线程池 可以根据服务器性能调整线程池大小
             int numberOfThreads = Runtime.getRuntime().availableProcessors() * 2;
             List<CompletableFuture<Void>> futures = new CopyOnWriteArrayList<>();
@@ -184,6 +191,10 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
                         source.setWelfareMember(null);
                         Sys_user user = userMap.get(source.getLoginname().toLowerCase());
 
+                        if (user != null && userIds.contains(user.getId())) {
+                            continue;
+                        }
+
                         boolean isNotEnterUser = NOT_ENTERING_PERSON_TYPE.contains(source.getPersonType())
                                 || NOT_ENTERING_USER_LOGIN_NAME.contains(source.getLoginname())
                                 || NOT_ENTERING_USER_STATE.contains(source.getUserState());