From 34f23b9bc07281df4bd454cbfcd3c12a98230afb Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 29 一月 2026 15:51:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
index c0c38f9..1e4ae1b 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -445,44 +445,63 @@
public Integer selectUserList(SysUser sysUser) {
List<SysUser> sysUserList = chMapper.selectUserList(sysUser);
SysUser suerTemp = new SysUser();
+ //鐢ㄦ埛-鏈烘瀯鍏崇郴-绉戝
List<SysUserDept> sysUserDeptAll = chMapper.yhyksxx(suerTemp);
+ //鐢ㄦ埛-鏈烘瀯鍏崇郴-鐥呮埧
+ List<SysUserDept> sysUserDeptBfAll = chMapper.yhybfxx(suerTemp);
//鐢ㄦ埛-闄㈠尯鍏崇郴
List<SysUserOrg> sysUserOrgAll = chMapper.yhyyqxx(suerTemp);
log.info("sysUserList鐨勯噰闆嗗埌鐨勬暟閲忎负锛歿}", sysUserList.size());
int i = 0;// sysUser2Mapper.batchUser(sysUserList);
for (SysUser sysUser1 : sysUserList) {
-// log.info("sysUser1鐨処D涓猴細{}", sysUser1.getUserId());
-// log.info("sysUser1鐨凥ISUSERID涓猴細{}", sysUser1.getHisUserId());
if (StringUtils.isEmpty(sysUser1.getHisUserId())) continue;
SysUser suTemp = new SysUser();
suTemp.setHisUserId(sysUser1.getHisUserId());
List<SysUser> usersTemp = sysUser2Mapper.selectUserList(suTemp);
+
+ //鏂板鐢ㄦ埛涓庣瀹�
+ List<SysUserDept> sysUserDept = sysUserDeptAll.stream().filter((SysUserDept b) -> b.getUserCode().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
+ //鏂板鐢ㄦ埛涓庣梾鍖�
+ List<SysUserDept> sysUserDeptBf = sysUserDeptBfAll.stream().filter((SysUserDept b) -> b.getUserCode().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
+ //鏂板鐢ㄦ埛涓庨櫌鍖�
+ List<SysUserOrg> sysUserOrg = sysUserOrgAll.stream().filter((SysUserOrg o) -> o.getUserId().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
if (usersTemp.size() > 0) {
sysUser1.setUserId(usersTemp.get(0).getUserId());
sysUser1.setUserName(sysUser1.getHisUserId());
+ //瀵瑰簲 SysUserServiceImpl selectUserByUserName2 191琛�
+ if (!org.springframework.util.CollectionUtils.isEmpty(sysUserOrg)) {
+ sysUser1.setOrgid(sysUserOrg.get(0).getOrgid());
+ sysUser1.setCampusid(sysUserOrg.get(0).getCampusid());
+ }
sysUser2Mapper.updateUser(sysUser1);
} else {
sysUser1.setUserName(sysUser1.getHisUserId());
sysUser2Mapper.insertUser(sysUser1);
+ //瀵瑰簲 SysUserServiceImpl selectUserByUserName2 191琛�
+ if (!org.springframework.util.CollectionUtils.isEmpty(sysUserOrg)) {
+ sysUser1.setOrgid(sysUserOrg.get(0).getOrgid());
+ sysUser1.setCampusid(sysUserOrg.get(0).getCampusid());
+ }
usersTemp = sysUser2Mapper.selectUserList(suTemp);
}
-
- //鏂板鐢ㄦ埛涓庨儴闂�
- //List<SysUserDept> sysUserDept = chMapper.yhyksxx(sysUser1);
- List<SysUserDept> sysUserDept = sysUserDeptAll.stream().filter((SysUserDept b) -> b.getUserCode().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
-
for (SysUserDept sud : sysUserDept) {
- if (usersTemp.size() > 0) {
+ if (!usersTemp.isEmpty()) {
+ sud.setDeptType("1");
sud.setUserId(usersTemp.get(0).getUserId());
sysUserDeptMapper.insertSysUserDept(sud);
}
}
- //鏂板鐢ㄦ埛涓庨櫌鍖�
- List<SysUserOrg> sysUserOrg = sysUserOrgAll.stream().filter((SysUserOrg o) -> o.getUserId().equals(sysUser1.getHisUserId())).collect(Collectors.toList());
+ for (SysUserDept sudb : sysUserDeptBf) {
+ if (!usersTemp.isEmpty()) {
+ sudb.setDeptType("2");
+ sudb.setUserId(usersTemp.get(0).getUserId());
+ sysUserDeptMapper.insertSysUserDept(sudb);
+ }
+ }
for (SysUserOrg suo : sysUserOrg) {
- if (usersTemp.size() > 0) {
- suo.setUserId(usersTemp.get(0).getUserId());
+ if (!usersTemp.isEmpty()) {
+ suo.setUserId(usersTemp.get(0).getUserId().toString());
sysUserOrgMapper.insertSysUserOrg(suo);
}
}
--
Gitblit v1.9.3