From f2b3713736aec20a28e905a6abad3edf6fe92fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 29 Mar 2022 06:06:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java | 2 +- .../resources/mybatis/mapper/xm/core/dao/XmQuestionMapper.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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)