From 680d3fee324d098c2b94b35f8c73a1ce108021b8 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 02:56:09 +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 --- .../java/com/xm/core/ctrl/XmTaskController.java | 16 ++++++++++++---- .../mybatis/mapper/xm/core/dao/XmMenuMapper.xml | 6 +++--- 2 files changed, 15 insertions(+), 7 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 7cc577c0..bf09f02d 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 @@ -379,10 +379,18 @@ public class XmTaskController { if(!tips.isOk()){ return ResponseHelper.failed(tips); } - xmTaskVo.setCreateUserid(user.getUserid()); - xmTaskVo.setCreateUsername(user.getUsername()); - xmTaskVo.setExecutorUserid(user.getUserid()); - xmTaskVo.setExecutorUsername(user.getUsername()); + if(!StringUtils.hasText(xmTaskVo.getCreateUserid())){ + xmTaskVo.setCreateUserid(user.getUserid()); + xmTaskVo.setCreateUsername(user.getUsername()); + } + xmTaskVo.setExecutorUserid(null); + xmTaskVo.setExecutorUsername(null); + xmTaskVo.setExeUserids(null); + xmTaskVo.setExeUsernames(null); + xmTaskVo.setTagIds(null); + xmTaskVo.setTaskSkillIds(null); + xmTaskVo.setTaskSkillNames(null); + xmTaskVo.setTagNames(null); xmTaskVo.setCreateTime(new Date()); xmTaskVo.setCbranchId(user.getBranchId()); xmTaskVo.setCdeptid(user.getDeptid()); 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 02a1b7ec..0b00e80f 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 @@ -222,13 +222,13 @@ (select count(*) from xm_menu m where m.pmenu_id=res.menu_id) as children_cnt, - res.* from xm_menu res inner join xm_product p on res.product_id=p.id where + res.* from xm_product p inner join xm_menu res on res.product_id=p.id where res.menu_id in #{item} - and ( (p.adm_userid=#{mmUserid} or p.pm_userid=#{mmUserid} or p.ass_userid=#{mmUserid}) - or exists( select 1 from xm_menu m where FIND_IN_SET(m.menu_id,res.pid_paths) and m.mm_userid=#{mmUserid} ) + 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} ) )