diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 5a90edc1..d143b9ed 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -304,7 +304,7 @@ public class XmTaskController { List can=new ArrayList<>(); List no=new ArrayList<>(); if(can.size()<=0){ - return ResponseHelper.failed("noqx","您无权修改选中的任务。"); + //return ResponseHelper.failed("noqx","您无权修改选中的任务。"); } Set fields=new HashSet<>(); fields.add("childrenCnt"); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml index f92ffbfa..d829513c 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml @@ -31,6 +31,8 @@ and res.name like #{key} and res.status != 'resolved' + + and exists (select 1 from xm_menu m where m.iteration_id=#{linkIterationId} and m.menu_id=res.menu_id)