From d052ae82184010d5e8b6a91ce233e59fd6e6a16c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 15 Aug 2024 11:11:53 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A7=94=E5=91=98=E4=BC=9A=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../committee/controller/PayCommitteeInfoController.java    | 4 ++--
 .../controller/PayCommitteeMemberInfoController.java        | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java b/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java
index 77123f89..c9901a41 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeInfoController.java
@@ -54,8 +54,8 @@ public class PayCommitteeInfoController extends JeroController<PayCommitteeInfo,
                                                          HttpServletRequest req) {
         QueryWrapper<PayCommitteeInfo> queryWrapper = QueryGenerator.initQueryWrapper(payCommitteeInfo, req.getParameterMap());
         queryWrapper.lambda()
-                .eq(PayCommitteeInfo::getDelFlag, CommonConstant.DEL_FLAG_0)
-                .orderByAsc(PayCommitteeInfo::getCommitteeNumber);
+                .eq(PayCommitteeInfo::getDelFlag, CommonConstant.DEL_FLAG_0);
+        queryWrapper.orderByAsc("CAST(REPLACE(REPLACE(committee_number, 'TC',''),'/SC','') AS UNSIGNED)");
         Page<PayCommitteeInfo> page = new Page<>(pageNo, pageSize);
         IPage<PayCommitteeInfo> pageList = payCommitteeInfoService.page(page, queryWrapper);
         return Result.OK(pageList);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeMemberInfoController.java b/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeMemberInfoController.java
index c3015f12..d20a809b 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeMemberInfoController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/committee/controller/PayCommitteeMemberInfoController.java
@@ -62,8 +62,10 @@ public class PayCommitteeMemberInfoController extends JeroController<PayCommitte
         queryWrapper.lambda()
                 .eq(StringUtils.isNotBlank(committeeNumber),PayCommitteeMemberInfo::getCommitteeNumber,committeeNumber)
                 .eq(PayCommitteeMemberInfo::getDelFlag, CommonConstant.DEL_FLAG_0)
-                .eq(StringUtils.isNotBlank(positionOfStandardsCommittee), PayCommitteeMemberInfo::getPositionOfStandardsCommittee, positionOfStandardsCommittee)
-                .orderByAsc(PayCommitteeMemberInfo::getNumber);
+                .eq(StringUtils.isNotBlank(positionOfStandardsCommittee), PayCommitteeMemberInfo::getPositionOfStandardsCommittee, positionOfStandardsCommittee);
+                //.orderByAsc(PayCommitteeMemberInfo::getNumber)
+        queryWrapper.orderByAsc("CAST(REPLACE(REPLACE(committee_number, 'TC',''),'/SC','') AS UNSIGNED),number");
+
         Page<PayCommitteeMemberInfo> page = new Page<>(pageNo, pageSize);
         IPage<PayCommitteeMemberInfo> pageList = payCommitteeMemberInfoService.page(page, queryWrapper);
         for (PayCommitteeMemberInfo record : pageList.getRecords()) {