From 369e6bc0aad44075a91546cd69251a430a798327 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Thu, 20 Feb 2025 13:29:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/BusinessMapper.xml           | 1 -
 .../resources/mapper/system/AdmissionRequestMapper.xml     | 7 ++-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml
index 120dabe..de9137f 100644
--- a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml
+++ b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml
@@ -407,7 +407,6 @@
         replace into nxdt_ii.pt_check_person_remark(
             task_id, user_id,type,version,audit_status,remark,audit_time,audit_remark
         )values (#{taskId},#{userId},#{type},#{vision},#{agree},#{rejectReason},now(),#{reason})
-
     </insert>
 
     <select id="getCommentListByProcessInstanceId" resultType="com.bonus.flowable.entity.CheckComment">
diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml
index e1fc156..ec5f71b 100644
--- a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml
+++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml
@@ -374,12 +374,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         lkc.pro_id AS proId,
         lkc.cont_uuid AS contUuid,
         lkc.cons_persion_id AS consPersonId,
-        lkc.cont_uuid AS contUuid,
         lkc.sub_uuid AS subUuid,
         lkc.admission_date AS admissionDate,
         lkc.departure_date AS departureDate,
         lkc.out_status as intoStatus,
-        #{dataType}  as status,
+        #{bean.dataType}  as status,
         lkc.task_id_out AS taskId,
         lkc.proc_inst_id_out as procInsId,
         pcp.cons_user_id AS consUserId,
@@ -401,9 +400,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         lkc.exit_reason as reason
         FROM
         lk_cont_person lkc
-        LEFT JOIN
-        pt_cons_person pcp ON lkc.cons_persion_id = pcp.cons_user_id
-        AND pcp.is_active = '1'
+        LEFT JOIN  pt_cons_person pcp ON lkc.cons_persion_id = pcp.cons_user_id  AND pcp.is_active = '1'
         left join sys_dict_data sdd on sdd.dict_value = pcp.post and sdd.dict_type = 'sys_cons_post' and sdd.status ='0'
         WHERE  lkc.into_status  = '3' AND lkc.out_status != '0'
         <if test="bean.proId != null and bean.proId != ''">