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 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 page = new Page<>(pageNo, pageSize); IPage 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 page = new Page<>(pageNo, pageSize); IPage pageList = payCommitteeMemberInfoService.page(page, queryWrapper); for (PayCommitteeMemberInfo record : pageList.getRecords()) {