更改生产环境文件上传的大小界限，修改用户数据的导入规则

jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -22,8 +22,8 @@ management:
 spring:
   servlet:
     multipart:
-      max-file-size: 10MB
-      max-request-size: 10MB
+      max-file-size: 2048MB
+      max-request-size: 2048MB
   mail:
     host: smtp.163.com
     username: jeecgos@163.com

module_kzks/src/main/java/org/jeecg/dataSync/task/UserDataSync.java

@@ -3,13 +3,17 @@ package org.jeecg.dataSync.task;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.sign.util.HttpUtils;
 import org.jeecg.dataSync.config.HrConfigurer;
+import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.entity.SysUserDepart;
 import org.jeecg.modules.system.entity.SysUserRole;
+import org.jeecg.modules.system.service.ISysDepartService;
 import org.jeecg.modules.system.service.ISysUserDepartService;
 import org.jeecg.modules.system.service.ISysUserRoleService;
 import org.jeecg.modules.system.service.ISysUserService;
@@ -41,6 +45,9 @@ public class UserDataSync implements Job {
     @Autowired
     private ISysUserDepartService sysUserDepartService;
 
+    @Autowired
+    private ISysDepartService departService;
+
     private static final Logger logger = LoggerFactory.getLogger(UserDataSync.class);
 
     @Override
@@ -90,10 +97,19 @@ public class UserDataSync implements Job {
 
                     //保存用户与hr系统部门的关联关系
                     String departOldId = item.get("department_id") == null ? "0" : item.get("department_id").toString();
-                    SysUserDepart sysUserDepart = new SysUserDepart();
-                    sysUserDepart.setUserId(sysUser.getId());
-                    sysUserDepart.setDepId(departOldId);
-                    sysUserDepartService.save(sysUserDepart);
+                    LambdaQueryWrapper<SysDepart> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(SysDepart::getOldId,departOldId);
+                    List<SysDepart> list1 = departService.list(wrapper);
+                    SysDepart depart = null;
+                    if (list1 != null && !list1.isEmpty()) {
+                        depart = list1.get(0);
+                    }
+                    if (depart != null && ObjectUtils.isNotEmpty(depart.getId())) {
+                        SysUserDepart sysUserDepart = new SysUserDepart();
+                        sysUserDepart.setUserId(sysUser.getId());
+                        sysUserDepart.setDepId(depart.getId());
+                        sysUserDepartService.save(sysUserDepart);
+                    }
                 }
             });
         }

module_kzks/src/main/java/org/jeecg/dataSync/task/UserDepartReJoin.java

@@ -0,0 +1,54 @@
+package org.jeecg.dataSync.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.SysUserDepart;
+import org.jeecg.modules.system.service.ISysDepartService;
+import org.jeecg.modules.system.service.ISysUserDepartService;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class UserDepartReJoin implements Job {
+
+    @Autowired
+    private ISysUserService userService;
+
+    @Autowired
+    private ISysDepartService departService;
+
+    @Autowired
+    private ISysUserDepartService userDepartService;
+
+    @Override
+    public void execute(JobExecutionContext context) throws JobExecutionException {
+        List<SysUser> list = userService.list();
+        for (SysUser sysUser : list) {
+            LambdaQueryWrapper<SysUserDepart> userDepartWrapper = new LambdaQueryWrapper<>();
+            userDepartWrapper.eq(SysUserDepart::getUserId,sysUser.getId());
+            List<SysUserDepart> userDepartList = userDepartService.list(userDepartWrapper);
+            if (!userDepartList.isEmpty()){
+                for (SysUserDepart sysUserDepart : userDepartList) {
+                    LambdaQueryWrapper<SysDepart> departWrapper = new LambdaQueryWrapper<>();
+                    departWrapper.eq(SysDepart::getOldId,sysUserDepart.getDepId());
+                    SysDepart one = departService.getOne(departWrapper);
+                    if (ObjectUtils.isNotEmpty(one)) {
+                        SysUserDepart sysUserDepart1 = new SysUserDepart();
+                        sysUserDepart1.setUserId(sysUser.getId());
+                        sysUserDepart1.setDepId(one.getId());
+                        userDepartService.save(sysUserDepart1);
+                        userDepartService.removeById(sysUserDepart.getId());
+                    }
+                }
+            }
+        }
+    }
+}