|
@@ -94,24 +94,27 @@ public class SsoSyncService {
|
|
|
if (ssoUserDtos.size()>0){
|
|
|
for (SsoUserDto ssoUserDto:ssoUserDtos){
|
|
|
User user=dbdcUserService.findBySsoId(ssoUserDto.getUSER_ID());
|
|
|
+ UserDto userDto =new UserDto();
|
|
|
+ userDto.setUserId(ssoUserDto.getUSER_ID());
|
|
|
+ userDto.setLoginName(ssoUserDto.getUSER_NAME());
|
|
|
+ userDto.setUserName(ssoUserDto.getUSER_NAME());
|
|
|
+ userDto.setFlag(1);
|
|
|
+ userDto.setPassword("Taiji@2024#YJJ");
|
|
|
+ userDto.setState("1");
|
|
|
+ userDto.setPhoneNum(ssoUserDto.getMOBILE());
|
|
|
+
|
|
|
+ userDto.setPriority("0");
|
|
|
+ userDto.setSsoUser(ssoUserDto.getUSER_ID());
|
|
|
+ userDto.setSsoUserName(ssoUserDto.getUSER_NAME());
|
|
|
+ userDto.setPwdDate("2050-01-01 00:00:00");
|
|
|
+
|
|
|
+ String orgId = ssoUserDto.getORG_ID();
|
|
|
+ Dept dept =sysDeptService.findDeptByOrgId(orgId);
|
|
|
if (Objects.isNull(user)){
|
|
|
- String orgId = ssoUserDto.getORG_ID();
|
|
|
- Dept dept =sysDeptService.findDeptByOrgId(orgId);
|
|
|
+// 判断当只有部门能关联上时才插入或者更新
|
|
|
if (Objects.nonNull(dept)){
|
|
|
- UserDto userDto =new UserDto();
|
|
|
- userDto.setUserId(ssoUserDto.getUSER_ID());
|
|
|
- userDto.setLoginName(ssoUserDto.getUSER_NAME());
|
|
|
- userDto.setUserName(ssoUserDto.getUSER_NAME());
|
|
|
- userDto.setFlag(1);
|
|
|
- userDto.setPassword("Taiji@2024#YJJ");
|
|
|
- userDto.setState("1");
|
|
|
- userDto.setPhoneNum(ssoUserDto.getMOBILE());
|
|
|
userDto.setDeptid(dept.getDeptId());
|
|
|
userDto.setPdeptids(dept.getPdeptids());
|
|
|
- userDto.setPriority("0");
|
|
|
- userDto.setSsoUser(ssoUserDto.getUSER_ID());
|
|
|
- userDto.setSsoUserName(ssoUserDto.getUSER_NAME());
|
|
|
- userDto.setPwdDate("2050-01-01 00:00:00");
|
|
|
dbdcUserService.userInsert(userDto);
|
|
|
|
|
|
RoleUserPK roleUserPK = new RoleUserPK();
|
|
@@ -120,6 +123,13 @@ public class SsoSyncService {
|
|
|
dbdcUserService.insertRoleUser(roleUserPK);
|
|
|
dbdcUserService.saveDeptUser(dept.getDeptId(),ssoUserDto.getUSER_ID());
|
|
|
}
|
|
|
+ }else {
|
|
|
+ if (Objects.nonNull(dept)){
|
|
|
+ userDto.setDeptid(dept.getDeptId());
|
|
|
+ userDto.setPdeptids(dept.getPdeptids());
|
|
|
+ dbdcUserService.updateUser(userDto);
|
|
|
+ dbdcUserService.saveDeptUser(dept.getDeptId(),ssoUserDto.getUSER_ID());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|