From c11a8d168531a7bd0a4ff2bbfd09a856f05d0c68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 18 May 2022 15:24:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=8F=8A=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E9=87=8D=E6=9E=84?= 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 | 1 + xm-core/src/main/java/com/xm/core/service/XmGroupService.java | 4 ++-- .../resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) 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 b65453da..1a60114f 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 @@ -392,6 +392,7 @@ public class XmTaskController { xmTaskVo.setCreateTime(new Date()); xmTaskVo.setCbranchId(user.getBranchId()); xmTaskVo.setCdeptid(user.getDeptid()); + xmTaskVo.setTaskState("0"); xmTaskVo.setRate(0); diff --git a/xm-core/src/main/java/com/xm/core/service/XmGroupService.java b/xm-core/src/main/java/com/xm/core/service/XmGroupService.java index 7bc32680..d6a0d9e9 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmGroupService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmGroupService.java @@ -392,7 +392,7 @@ public class XmGroupService extends BaseService { return true; }else{ Optional optional=xmGroupVoList.stream().filter(i->i.getId().equals(ug.getPgroupId())).findAny(); - while (optional!=null && !optional.isPresent()){ + while (optional!=null && optional.isPresent()){ XmGroupVo g=optional.get(); if(headUserid.equals(g.getLeaderUserid())){ return true; @@ -427,7 +427,7 @@ public class XmGroupService extends BaseService { return true; }else{ Optional optional=xmGroupVoList.stream().filter(i->i.getId().equals(ug.getPgroupId())).findAny(); - while (optional!=null && !optional.isPresent()){ + while (optional!=null && optional.isPresent()){ XmGroupVo g=optional.get(); if(headUserid.equals(g.getLeaderUserid())||headUserid.equals(g.getAssUserid())){ return true; diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml index 0b00e80f..e9705aa3 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmMenuMapper.xml @@ -228,7 +228,7 @@ #{item} and ( #{mmUserid} in (p.adm_userid,p.pm_userid, p.ass_userid) - or exists( select 1 from xm_menu m where res.pid_paths like concat(m.pid_paths,'%') and m.mm_userid=#{mmUserid} ) + or exists( select 1 from xm_menu m where m.mm_userid=#{mmUserid} and res.pid_paths like concat(m.pid_paths,'%') ) )