From 65c29ed33d3fff1179e506caa986673b77e717bc Mon Sep 17 00:00:00 2001
From: zhouxy <Zhouxy_123>
Date: Mon, 5 Jan 2026 21:46:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=8C=E6=94=BF=E5=A4=84?=
 =?UTF-8?q?=E7=BD=9A=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TBizRemPunishmentController.java          | 13 ++++++-------
 .../crgs/punish/TbIlcPunInfoQueryMapper.xml   | 19 ++-----------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java
index 5fda5eb..08bfc21 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentController.java
@@ -127,15 +127,14 @@ public class TBizRemPunishmentController extends BaseController {
     @PostMapping("/punishmentList")
     public RestResult<IPage<?>> punishmentList(@RequestBody PageRequestDto pageRequestDto) {
         AICUser curUser = SSOUtil.getUser();
-        System.out.println(curUser.toString());
 
         //获取当前用户所在辖区
-        String region = "";
-        if (curUser.getOrgName().indexOf("区") != -1) {
-            region=curUser.getOrgName().substring(curUser.getOrgName().indexOf("市") == -1? 0 : curUser.getOrgName().indexOf("市") + 1, curUser.getOrgName().indexOf("区"));
-        } else {
-            region="市";
-        }
+        String region = curUser.getRegionID();
+//        if (curUser.getOrgName().indexOf("区") != -1) {
+//            region=curUser.getOrgName().substring(curUser.getOrgName().indexOf("市") == -1? 0 : curUser.getOrgName().indexOf("市") + 1, curUser.getOrgName().indexOf("区"));
+//        } else {
+//            region="市";
+//        }
         System.out.println(region);
         pageRequestDto.getParamMap().put("region",region);
         IPage<TbIlcPunInfoQuery> iPage = tbIlcPunInfoQueryService.searchByPage(new Page<>(pageRequestDto.getCurPage(), pageRequestDto.getPageSize()), pageRequestDto.getParamMap());
diff --git a/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml b/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml
index 8b2cf8b..f1bac4f 100644
--- a/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml
+++ b/src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml
@@ -81,25 +81,10 @@
         from case_pub_nbaseinfo
         where ACTYPE = '1'
         <if test="params.region != null and params.region!= '' and params.region!= '市'.toString()">
-            and  PENAUTH_CN like concat('%', #{params.region}, '%')
+            and PENAUTH like concat(#{params.region}, '%')
         </if>
-
-        <if test="params.region != null and params.region!= '' and params.region == '市'.toString()">
-            and  PENAUTH_CN not like '%荔湾%'
-            and  PENAUTH_CN not like '%越秀%'
-            and  PENAUTH_CN not like '%海珠%'
-            and  PENAUTH_CN not like '%天河%'
-            and  PENAUTH_CN not like '%南沙%'
-            and  PENAUTH_CN not like '%白云%'
-            and  PENAUTH_CN not like '%黄埔%'
-            and  PENAUTH_CN not like '%花都%'
-            and  PENAUTH_CN not like '%从化%'
-            and  PENAUTH_CN not like '%增城%'
-            and  PENAUTH_CN not like '%番禺%'
-        </if>
-
         <if test="params.uniscid != null and params.uniscid!= ''">
-            and uniscid = #{params.uniscid}
+            and (uniscid = #{params.uniscid} or REGNO = #{params.uniscid})
         </if>
         <if test="params.dsrmc != null and params.dsrmc != ''">
             and ENTNAME like concat('%', #{params.dsrmc}, '%')