From 781d2de6fed258386253e01a0aad5257d5ff4284 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 18 Oct 2023 17:10:57 +0800
Subject: [PATCH] 10/18

---
 .../crm/biz/projectinformation/ProjectInformationService.java | 4 ++--
 .../main/java/com/yxt/supervise/system/sysuser/SysUser.java   | 1 +
 .../main/java/com/yxt/supervise/system/sysuser/SysUser.java   | 2 ++
 .../java/com/yxt/supervise/system/sysuser/SysUserService.java | 2 ++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
index 98fc318d..3a4be7a6 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java
@@ -225,8 +225,8 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
             //主体
             SysUser sysUser = sysUserFeign.getUserBySid(bank.getManagerSid()).getData();
             SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(bank.getBankSid()).getData();
-            bank.setSysUser(sysUser);
-            bank.setSysOrganizationVo(sysOrganizationVo);
+            bank.setBankName(sysOrganizationVo.getName());
+            bank.setBManagerName(sysUser.getName());
             projectInfoVo.setBaseInfo(bank);
             projectInfoVo.setSid(bank.getSid());
             //企业
diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java
index e9d570cc..73c867bd 100644
--- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java
+++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java
@@ -74,4 +74,5 @@ public class SysUser extends BaseEntity {
     private String unionid;
     //d订阅状态
     private String subscriptionStatus;
+    private String name;
 }
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java
index e9d570cc..bf4b3124 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUser.java
@@ -74,4 +74,6 @@ public class SysUser extends BaseEntity {
     private String unionid;
     //d订阅状态
     private String subscriptionStatus;
+    @TableField(exist = false)
+    private String name;
 }
diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java
index 4543c00c..d233d23a 100644
--- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java
+++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java
@@ -233,6 +233,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     }
     public SysUser getUserBySid(String sid) {
         SysUser entity = this.fetchBySid(sid);
+        SysStaffinfo sysStaffinfo=sysStaffinfoService.fetchBySid(entity.getStaffSid());
         List<SysUserRole> s=userRoleService.list(new QueryWrapper<SysUserRole>().eq("userSid",sid));
         List<String> roles=new ArrayList<>();
         for(SysUserRole sysUserRole:s){
@@ -241,6 +242,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
                 roles.add(sysRole.getName());
             }
         }
+        entity.setName(sysStaffinfo.getName());
         entity.setRoleNames(roles);
         return entity;
     }