From 1967931886657be0a8d37b6d1aa776244ff362dd Mon Sep 17 00:00:00 2001
From: YY <1272464982@qq.com>
Date: Tue, 15 Jul 2025 11:05:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=AD=E5=8F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml     | 2 +-
 .../dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml      | 2 +-
 .../zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryMapper.xml  | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
index 3861b40..38fe8ab 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryMapper.xml
@@ -221,7 +221,7 @@
         ccl.remark,
         CASE
         WHEN ccl.approve_status = 0 AND ccl.work_flow_id IS NULL THEN '未开始'
-        WHEN ccl.approve_status = 0 AND ccl.work_flow_id IS NOT NULL THEN '进行中'
+        WHEN ccl.approve_status = 3 THEN '进行中'
         ELSE '已结束'
         END AS approveStatusName,
         CASE
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml
index 1126c82..06acf9b 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibrarySupplierApplyMapper.xml
@@ -186,7 +186,7 @@
 
         select cclsa.id, ccl.name,ccl.area,'张三' as applyUser ,
                ccl.create_time as applyTime,cclsa.approve_status as approveStatus,
-               case when cclsa.approve_status=0 then '未开始'
+               case when cclsa.approve_status=0 and cclsa.work_flow_id is  null then '未开始'
                     when cclsa.approve_status=0 and cclsa.work_flow_id is not null then '进行中'
                     else '已结束'
                    end as processStatusName,
diff --git a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryMapper.xml b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryMapper.xml
index f9134e2..7b54065 100644
--- a/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryMapper.xml
+++ b/src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryMapper.xml
@@ -87,11 +87,13 @@
 
             </if>
         </where>
+        order by cc.order_by asc
     </select>
 
     <select id="selectMyPage" parameterType="object"
             resultMap="CoscoCategoryResult">
         <include refid="selectCoscoCategoryVo"/>
+        order by order_by asc
     </select>
 
     <select id="selectCoscoCategoryById" parameterType="String"