From 8ea75b9838623f5dbf0eaf829911d3bf10a144b8 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 30 Oct 2023 10:06:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(iam):=20QueryUserByIdService=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=B1=9E=E6=80=A7=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docking/iam/service/SyncIamService.java   | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java
index a14a6fde..e9a710b4 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java
@@ -1,7 +1,6 @@
 package com.jero.modules.docking.iam.service;
 
 import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.NumberUtil;
@@ -27,8 +26,8 @@ import com.jero.modules.docking.iam.dto.bpmc.UserRoleDto;
 import com.jero.modules.docking.iam.dto.response.*;
 import com.jero.modules.docking.iam.exception.IamGlobalException;
 import com.jero.modules.docking.iam.po.MessageHeader;
-import com.jero.modules.docking.iam.po.encrypt.SendPoEncryptPo;
 import com.jero.modules.docking.iam.po.encrypt.SendEncryptReturnsPo;
+import com.jero.modules.docking.iam.po.encrypt.SendPoEncryptPo;
 import com.jero.modules.docking.utils.DockingConstant;
 import com.jero.modules.system.entity.*;
 import com.jero.modules.system.service.*;
@@ -40,11 +39,11 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.lang.reflect.Field;
-import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -951,7 +950,7 @@ public class SyncIamService {
      */
     public IamUserInfoResponse getUserInfoById(IamUserAcceptDto iamUserAcceptDto){
         LoginUser userInfo = sysBaseAPI.getUserById(iamUserAcceptDto.getBimUid());
-
+        SysUser sysUser = sysUserService.getById(iamUserAcceptDto.getBimUid());
         if (userInfo == null){
             throw new IamGlobalException(iamUserAcceptDto.getBimRequestId(), "查询用户不存在");
         }
@@ -961,6 +960,23 @@ public class SyncIamService {
         userAcceptDto.setSrmsUsername(userInfo.getUsername());
         userAcceptDto.setSrmsRealname(userInfo.getRealname());
         userAcceptDto.setSrmsOrgCode(userInfo.getOrgCode());
+        if (!Objects.isNull(userInfo.getSex())){
+            userAcceptDto.setSrmsSex(String.valueOf(userInfo.getSex()));
+        }
+        userAcceptDto.setSrmsEmail(userInfo.getEmail());
+        userAcceptDto.setSrmsPhone(userInfo.getPhone());
+        userAcceptDto.setSrmsOfficePhone(userInfo.getTelephone());
+        if (!Objects.isNull(userInfo.getCreateTime())){
+            userAcceptDto.setSrmsCreateTime(new SimpleDateFormat(DATE_FORMAT).format(userInfo.getCreateTime()));
+        }
+        if (!Objects.isNull(sysUser.getUpdateTime())){
+            userAcceptDto.setSrmsUpdateTime(new SimpleDateFormat(DATE_FORMAT).format(sysUser.getUpdateTime()));
+        }
+        userAcceptDto.setSrmsTypeId(sysUser.getTypeId());
+        userAcceptDto.setSrmsPost(sysUser.getPost());
+        userAcceptDto.setSrmsDutyLevelId(sysUser.getDutyLevelId());
+        userAcceptDto.setSrmsDirectLeadership(sysUser.getDirectLeadership());
+        userAcceptDto.setSrmsPostStatus(sysUser.getPostStatus());
 
         IamUserInfoResponse iamUserInfoResponse = new IamUserInfoResponse();
         iamUserInfoResponse.setAccount(userAcceptDto);