From ca2f42ad97e8ad5ac49f63950d16f28a3e59c0f3 Mon Sep 17 00:00:00 2001
From: zhouxy <Zhouxy_123>
Date: Sat, 7 Feb 2026 16:34:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=B3=A8=E9=94=80=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E7=99=BB=E8=AE=B0=E6=9C=BA=E5=85=B3=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=90=8E=E7=9A=84=E7=99=BB=E8=AE=B0=E6=9C=BA?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../querydto/ForceDeregisterSpeQueryDto.java       |  3 +++
 .../impl/XrForceDeregisterSpeServiceImpl.java      | 14 ++++++++------
 .../aiccs/force/XrForceDeregisterSpeMapper.xml     |  5 ++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java
index 747f4c1..c71e35e 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/entity/querydto/ForceDeregisterSpeQueryDto.java
@@ -97,4 +97,7 @@ public class ForceDeregisterSpeQueryDto extends BaseParamDto implements Serializ
     @ApiModelProperty("是否查即将届满，0否，1是")
     private String soon;
 
+    @ApiModelProperty("映射后的登记机关")
+    private String acceptRegorg;
+
 }
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java
index 0d21520..f28dd94 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/force/service/impl/XrForceDeregisterSpeServiceImpl.java
@@ -122,10 +122,12 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
 
         // 获取用户地区ID并设置为9位
         String regionID = user.getRegionID();
-        if (regionID.length() == 6) {
-            regionID = regionID + "000";
-        }
-        entity.setRegOrg(regionID);
+//        if (regionID.length() == 6) {
+//            regionID = regionID + "000";
+//        }
+//        entity.setRegOrg(regionID);
+        //改为用映射后的登记机关
+        entity.setAcceptRegorg(regionID);
 
         Page<EBaseinfo> page = new Page<>(query.getCurrent(), query.getSize());
 
@@ -190,7 +192,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
                     .setUniscId(eBaseinfo.getUniscid())
                     .setRegno(eBaseinfo.getRegno())
                     .setEntName(eBaseinfo.getEntname())
-                    .setRegOrg(eBaseinfo.getRegorg())
+                    .setRegOrg(eBaseinfo.getAcceptRegorg())
                     .setRegOrgCn(eBaseinfo.getRegorgCn())
                     .setStatus(FlowConstant.LINK_STATUS_ZERO)
                     .setNoticeTitle(noticeTitle)
@@ -855,7 +857,7 @@ public class XrForceDeregisterSpeServiceImpl extends ServiceImpl<XrForceDeregist
                     .setUniscId(eBaseinfo.getUniscid())
                     .setRegno(eBaseinfo.getRegno())
                     .setEntName(eBaseinfo.getEntname())
-                    .setRegOrg(eBaseinfo.getRegorg())
+                    .setRegOrg(eBaseinfo.getAcceptRegorg())
                     .setRegOrgCn(eBaseinfo.getRegorgCn())
                     .setStatus(FlowConstant.LINK_STATUS_ZERO)
                     .setNoticeTitle(noticeTitle)
diff --git a/src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml b/src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml
index 84f7012..845e99f 100644
--- a/src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml
+++ b/src/main/resources/mybatis/mapper/aiccs/force/XrForceDeregisterSpeMapper.xml
@@ -258,7 +258,7 @@
             </if>
             and b.REGSTATE != '4'
             and (
-                b.ENTTYPE like '1%' 
+                b.ENTTYPE like '1%'
                 or b.ENTTYPE like '2%'
                 or b.ENTTYPE like '5%'
                 or b.ENTTYPE like '6%'
@@ -277,6 +277,9 @@
                 and r.REVDATE &gt;= #{param.revStartDate}
                 and r.REVDATE &lt;= #{param.revEndDate}
             </if>
+            <if test="param.acceptRegorg != null and param.acceptRegorg != ''">
+                and b.ACCEPTREGORG = #{param.acceptRegorg}
+            </if>
         </where>
         order by b.APPRDATE desc
     </select>