Merge remote-tracking branch 'origin/master'

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

@@ -3,6 +3,8 @@ package org.jeecg.dataSync.task;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
+import org.jeecg.common.constant.FillRuleConstant;
+import org.jeecg.common.util.FillRuleUtil;
 import org.jeecg.config.sign.util.HttpUtils;
 import org.jeecg.dataSync.config.HrConfigurer;
 import org.jeecg.dataSync.util.WebServiceUtil;
@@ -53,6 +55,13 @@ public class DepartDataSync {
                 depart.setUpdateTime(currentDate);
                 depart.setDelFlag("0");
                 depart.setStatus("1");
+
+                // 根据parentId生成 org_code
+                com.alibaba.fastjson.JSONObject jsonObject = new com.alibaba.fastjson.JSONObject();
+                jsonObject.put("parentId",String.valueOf((int) item.get("parent_id")));
+                String[] codeArray = (String[]) FillRuleUtil.executeRule(FillRuleConstant.DEPART,jsonObject);
+                depart.setOrgCode(codeArray[0]); // 机构编码，用于做数据权限
+
                 sysDeparts.add(depart);
             });
             sysDepartService.saveOrUpdateBatch(sysDeparts);

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

@@ -4,6 +4,8 @@ package org.jeecg.dataSync.task;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+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.SysUser;
@@ -82,6 +84,11 @@ public class UserDataSync {
                     sysUser.setUsername(item.get("login").toString());//账号
                     sysUser.setEmail(item.get("login").toString() + "@c513.cast.casc");//邮箱
 
+                    String salt = oConvertUtils.randomGen(8);
+                    sysUser.setSalt(salt);  //md5密码盐
+                    String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), hrConfigurer.getPwd(), salt);
+                    sysUser.setPassword(passwordEncode);  //密码 (加密)
+
                     SysUserRole sysUserRole = new SysUserRole();
                     sysUserRole.setUserId(sysUser.getId());
                     sysUserRole.setRoleId("1"); //默认角色