From 5bdb4cb44c1e6bd17fdc656430a6502173f8a62e Mon Sep 17 00:00:00 2001
From: zhouxy <Zhouxy_123>
Date: Mon, 5 Jan 2026 14:08:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E7=94=A8=E4=BF=AE=E5=A4=8D=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E6=95=B0=E9=87=8F=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aiccs/aiccs/business/controller/TaskController.java      | 1 +
 .../mybatis/mapper/aiccs/business/TSTaskListMapper.xml       | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java b/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java
index 62d41f7..833365a 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/business/controller/TaskController.java
@@ -302,6 +302,7 @@ public class TaskController extends BaseController {
         taskListParam.setSignuserid(curUser.getPrimaryKey());
 
         Map<String, Object> customParamMap = pageRequestDto.getCustomParamMap();
+        customParamMap.put("areaCode", curUser.getRegionID());
 
         if(customParamMap != null && customParamMap.get("UNISCIDORREGNO")!=null){
             if (StringUtils.isNotBlank(customParamMap.get("UNISCIDORREGNO").toString())) {
diff --git a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml
index 918c2cf..4918077 100644
--- a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml
+++ b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml
@@ -452,8 +452,9 @@
                 </if>
 
             </if>
-            and ( m.SIGNUSERID = #{customParamMap.userId} or exists (select 1 from tsrefgroupanduser tg
-            where tg.GROUPID = m.ACCEPTGROUPID and tg.USERID = #{customParamMap.userId}))
+            and ( m.SIGNUSERID = #{customParamMap.userId}
+            or (m.area_code = #{customParamMap.areaCode} AND m.currentNodeOrBizStatus = 'exptlistEnter' AND m.SIGNUSERID IS null)
+            or exists (select 1 from tsrefgroupanduser tg where tg.GROUPID = m.ACCEPTGROUPID and tg.USERID = #{customParamMap.userId}))
         </where>
     </select>