From ce2d341234e58c882693a12e62512f7683d3a482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Tue, 27 May 2025 10:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=90=86=E5=8D=95=E4=BD=8D=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=93=E8=B4=A3=E6=96=B0=E5=BB=BA=E5=AE=A1=E6=A0=B8=E6=B5=81?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bonus/flowable/entity/AuditTask.java    | 3 +++
 .../main/resources/mapper/system/AdmissionRequestMapper.xml   | 1 +
 .../main/resources/mapper/system/SupervisionUnitMapper.xml    | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/AuditTask.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/AuditTask.java
index a9266fc..f0bc39d 100644
--- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/AuditTask.java
+++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/entity/AuditTask.java
@@ -20,6 +20,9 @@ public class AuditTask {
     private String taskId;
     @NotNull
     private String contUuid;
+    /**
+     * 00业主用户、01监理用户、02承包商、03分包商
+     */
     @NotNull
     private String userType;
     @NotNull
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 9bb838c..9fa44a2 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
@@ -534,6 +534,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.beginTime != null and params.beginTime != ''">
             and pfp.create_time between #{params.beginTime} and #{params.endTime}
         </if>
+        order by pfp.create_time desc
     </select>
 
 
diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml
index 70a295b..80f332b 100644
--- a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml
+++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml
@@ -204,7 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND ppi.pro_name like concat('%',#{proName},'%')
         </if>
         <if test="supName != null and supName != ''">
-            AND ppi.sup_name like concat('%',#{supName},'%')
+            AND ppi.sup_unit_name like concat('%',#{supName},'%')
         </if>
         <if test="proId != null and proId != ''">
             AND ppi.pro_id = #{proId}
@@ -252,4 +252,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>