From fe2ecb3897bd404d7c8f35cdf0133c1a230b7303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 27 Jan 2023 23:41:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=A7=84=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xm/core/ctrl/XmMenuController.java | 7 ++++--- .../src/main/java/com/xm/core/ctrl/XmTaskController.java | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java index 240f5145..3c6bc967 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java @@ -213,7 +213,7 @@ public class XmMenuController { @RequestMapping(value="/getXmMenuAttDist",method=RequestMethod.GET) public Map getXmMenuAttDist( @ApiIgnore @RequestParam Map xmMenu){ User user=LoginUtils.getCurrentUserInfo(); - xmMenu.put("branchId",user.getBranchId()); + xmMenu.put("pbranchId",user.getBranchId()); List> datas= this.xmMenuService.getXmMenuAttDist(xmMenu); return ResponseHelper.ok("ok","成功",datas); } @@ -221,7 +221,7 @@ public class XmMenuController { @RequestMapping(value="/getXmMenuAgeDist",method=RequestMethod.GET) public Map getXmMenuAgeDist( @ApiIgnore @RequestParam Map xmMenu){ User user=LoginUtils.getCurrentUserInfo(); - xmMenu.put("branchId",user.getBranchId()); + xmMenu.put("pbranchId",user.getBranchId()); List> datas= this.xmMenuService.getXmMenuAgeDist(xmMenu); return ResponseHelper.ok("ok","成功",datas); } @@ -230,7 +230,7 @@ public class XmMenuController { public Map getXmMenuSort( @ApiIgnore @RequestParam Map xmMenu){ User user=LoginUtils.getCurrentUserInfo(); PageUtils.startPage(xmMenu); - xmMenu.put("branchId",user.getBranchId()); + xmMenu.put("pbranchId",user.getBranchId()); List> datas= this.xmMenuService.getXmMenuSort(xmMenu); Map m=new HashMap<>(); PageUtils.responePage(m,datas); @@ -307,6 +307,7 @@ public class XmMenuController { xmMenu.setStatus("0"); xmMenu.setChildrenCnt(0); xmMenu.setPbranchId(xmProduct.getBranchId()); + if(!StringUtils.hasText(xmMenu.getProposerId())){ xmMenu.setProposerId(user.getUserid()); xmMenu.setProposerName(user.getUsername()); 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 d22db794..bda8b747 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 @@ -202,7 +202,7 @@ public class XmTaskController { @RequestMapping(value="/getXmTaskAttDist",method=RequestMethod.GET) public Map getXmTaskAttDist( @ApiIgnore @RequestParam Map xmTask){ User user=LoginUtils.getCurrentUserInfo(); - xmTask.put("branchId",user.getBranchId()); + xmTask.put("pbranchId",user.getBranchId()); List> datas= this.xmTaskService.getXmTaskAttDist(xmTask); return ResponseHelper.ok("ok","成功",datas); } @@ -210,7 +210,7 @@ public class XmTaskController { @RequestMapping(value="/getXmTaskAgeDist",method=RequestMethod.GET) public Map getXmTaskAgeDist( @ApiIgnore @RequestParam Map xmTask){ User user=LoginUtils.getCurrentUserInfo(); - xmTask.put("branchId",user.getBranchId()); + xmTask.put("pbranchId",user.getBranchId()); List> datas= this.xmTaskService.getXmTaskAgeDist(xmTask); return ResponseHelper.ok("ok","成功",datas); } @@ -241,7 +241,7 @@ public class XmTaskController { public Map getXmTaskSort( @ApiIgnore @RequestParam Map xmTask){ User user=LoginUtils.getCurrentUserInfo(); PageUtils.startPage(xmTask); - xmTask.put("branchId",user.getBranchId()); + xmTask.put("pbranchId",user.getBranchId()); List> datas= this.xmTaskService.getXmTaskSort(xmTask); Map m=new HashMap<>(); PageUtils.responePage(m,datas);