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 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 @@ - 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}))