From df400f758b35377152197c6a8ce7f9b7b21c2aae Mon Sep 17 00:00:00 2001
From: lijun <lj7788@126.com>
Date: Mon, 14 Oct 2024 00:01:52 +0800
Subject: [PATCH] update code

---
 .../manage/domain/ProProjectInfoSubdeptsUsers.java     | 10 ++++++++++
 .../manage/ProProjectInfoSubdeptsUsersMapper.xml       |  3 ++-
 .../manage/controller/UniCallBackController.java       |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java
index cfbc7f44..a1dde3ee 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java
@@ -112,6 +112,16 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
 
     private Long subStep;
 
+    private String comName;
+
+    public String getComName() {
+        return comName;
+    }
+
+    public void setComName(String comName) {
+        this.comName = comName;
+    }
+
     /** 疾病状态 */
 
     private Long illnessStatus;
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
index 4cb2b5fe..451add76 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="ProProjectInfoSubdeptsUsers" id="ProProjectInfoSubdeptsUsersResult">
         <result property="id"    column="id"    />
         <result property="comId"    column="com_id"    />
+        <result property="comName" column="comName"/>
         <result property="projectId"    column="project_id"    />
         <result property="projectName"    column="project_name"    />
         <result property="subDeptId"    column="sub_dept_id"    />
@@ -64,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                psu.sub_dept_group_name, psu.craft_type, psu.craft_post, psu.edu_status, psu.edu_file_path, psu.edu_sign_path, psu.edu_date, psu.approve_status,
                psu.use_status, psu.sub_step, psu.illness_status, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time,
                psu.remark,su.`user_name`,su.`nick_name`,su.`user_type`,su.`card_type`,su.`card_code`,su.admitGuid,su.admitGuid usAdmitGuid,
-               dic1.dict_label craft_type_name,dic2.dict_label craft_post_name,psu.enter_state,
+               dic1.dict_label craft_type_name,dic2.dict_label craft_post_name,psu.enter_state,sd.dept_name comName,
                su.`user_picture`, su.`card_img_inv`,su.`card_img_pos`,su.`user_infos`,su.`email`,su.`phonenumber`,su.`sex`,su.`avatar`,su.`login_ip`,su.`login_date`
         FROM pro_project_info_subdepts_users psu
                  LEFT JOIN sys_user su ON psu.user_id=su.user_id
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/UniCallBackController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/UniCallBackController.java
index 6b95f42f..4163e0cf 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/UniCallBackController.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/UniCallBackController.java
@@ -127,7 +127,7 @@ public class UniCallBackController {
                     if(proUser!=null && proUser.getUser()!=null){
                         AttendanceUbiData addData=new AttendanceUbiData();
                         addData.setAdmitGuid(admitGuid);
-                        addData.setComName(proUser.getActiveComName());
+                        addData.setComName(proUser.getComName());
                         addData.setProjectName(proUser.getProjectName());
                         addData.setComId(proUser.getComId());
                         addData.setUserId(proUser.getUserId());