From 586634deb2da6eb9a259a8c5cac6a8b8cb88b410 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:31:18 +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 --- .../java/com/xm/core/ctrl/XmBranchStateController.java | 2 ++ .../com/xm/core/ctrl/XmBranchStateHisController.java | 2 ++ .../com/xm/core/ctrl/XmProductStateController.java | 4 ++++ .../com/xm/core/ctrl/XmProductStateHisController.java | 4 ++++ .../com/xm/core/ctrl/XmProjectStateController.java | 4 ++++ .../com/xm/core/ctrl/XmProjectStateHisController.java | 4 ++++ .../java/com/xm/core/ctrl/XmQuestionController.java | 10 +++++----- .../java/com/xm/core/ctrl/XmTestCasedbController.java | 2 +- .../com/xm/core/ctrl/XmTestPlanCaseController.java | 10 ++++++++++ 9 files changed, 36 insertions(+), 6 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java index c3c20b23..6177a87b 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java @@ -62,6 +62,8 @@ public class XmBranchStateController { Map m = new HashMap<>(); RequestUtils.transformArray(xmBranchState, "ids"); PageUtils.startPage(xmBranchState); + User user=LoginUtils.getCurrentUserInfo(); + xmBranchState.put("branchId",user.getBranchId()); List> xmBranchStateList = xmBranchStateService.selectListMapByWhere(xmBranchState); //列出XmBranchState列表 PageUtils.responePage(m, xmBranchStateList); m.put("data",xmBranchStateList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateHisController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateHisController.java index 07763a35..e65e90f0 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateHisController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateHisController.java @@ -59,6 +59,8 @@ public class XmBranchStateHisController { Tips tips=new Tips("查询成功"); RequestUtils.transformArray(xmBranchStateHis, "pkList"); PageUtils.startPage(xmBranchStateHis); + User user=LoginUtils.getCurrentUserInfo(); + xmBranchStateHis.put("branchId",user.getBranchId()); List> xmBranchStateHisList = xmBranchStateHisService.selectListMapByWhere(xmBranchStateHis); //列出XmBranchStateHis列表 PageUtils.responePage(m, xmBranchStateHisList); m.put("data",xmBranchStateHisList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java index bfc71eaf..dee1804f 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java @@ -4,6 +4,8 @@ import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmProductState; import com.xm.core.service.XmProductStateService; import io.swagger.annotations.*; @@ -96,6 +98,8 @@ public class XmProductStateController { Map m = new HashMap<>(); RequestUtils.transformArray(xmProductState, "ids"); PageUtils.startPage(xmProductState); + User user= LoginUtils.getCurrentUserInfo(); + xmProductState.put("branchId",user.getBranchId()); List> xmProductStateList = xmProductStateService.selectListMapByWhere(xmProductState); //列出XmProductState列表 PageUtils.responePage(m, xmProductStateList); m.put("data",xmProductStateList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateHisController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateHisController.java index eb40b409..d66b93b2 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateHisController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateHisController.java @@ -3,6 +3,8 @@ package com.xm.core.ctrl; import com.mdp.core.entity.Tips; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmProductStateHis; import com.xm.core.service.XmProductStateHisService; import io.swagger.annotations.Api; @@ -55,6 +57,8 @@ public class XmProductStateHisController { Tips tips=new Tips("查询成功"); RequestUtils.transformArray(xmProductStateHis, "pkList"); PageUtils.startPage(xmProductStateHis); + User user= LoginUtils.getCurrentUserInfo(); + xmProductStateHis.put("branchId",user.getBranchId()); List> xmProductStateHisList = xmProductStateHisService.selectListMapByWhere(xmProductStateHis); //列出XmProductStateHis列表 PageUtils.responePage(m, xmProductStateHisList); m.put("data",xmProductStateHisList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java index 0e704424..06754302 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java @@ -4,6 +4,8 @@ import com.mdp.core.entity.Tips; import com.mdp.core.err.BizException; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmProductState; import com.xm.core.entity.XmProjectState; import com.xm.core.service.XmProjectStateService; @@ -117,6 +119,8 @@ public class XmProjectStateController { Map m = new HashMap<>(); RequestUtils.transformArray(xmProjectState, "ids"); PageUtils.startPage(xmProjectState); + User user= LoginUtils.getCurrentUserInfo(); + xmProjectState.put("branchId",user.getBranchId()); List> xmProjectStateList = xmProjectStateService.selectListMapByWhere(xmProjectState); //列出XmProjectState列表 PageUtils.responePage(m, xmProjectStateList); m.put("data",xmProjectStateList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java index eca86ad5..240a1bfc 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java @@ -3,6 +3,8 @@ package com.xm.core.ctrl; import com.mdp.core.entity.Tips; import com.mdp.core.utils.RequestUtils; import com.mdp.mybatis.PageUtils; +import com.mdp.safe.client.entity.User; +import com.mdp.safe.client.utils.LoginUtils; import com.xm.core.entity.XmProjectStateHis; import com.xm.core.service.XmProjectStateHisService; import io.swagger.annotations.*; @@ -113,6 +115,8 @@ public class XmProjectStateHisController { Map m = new HashMap<>(); RequestUtils.transformArray(xmProjectStateHis, "ids"); PageUtils.startPage(xmProjectStateHis); + User user= LoginUtils.getCurrentUserInfo(); + xmProjectStateHis.put("branchId",user.getBranchId()); List> xmProjectStateHisList = xmProjectStateHisService.selectListMapByWhere(xmProjectStateHis); //列出XmProjectStateHis列表 PageUtils.responePage(m, xmProjectStateHisList); m.put("data",xmProjectStateHisList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java index 1026eee5..2f734496 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java @@ -104,7 +104,7 @@ public class XmQuestionController { PageUtils.startPage(xmQuestion); User user = LoginUtils.getCurrentUserInfo(); if(LoginUtils.isBranchAdmin()){ - xmQuestion.put("branchId",user.getBranchId()); + xmQuestion.put("pbranchId",user.getBranchId()); }else { xmQuestion.put("compete",user.getUserid()); } @@ -122,7 +122,7 @@ public class XmQuestionController { @RequestMapping(value="/getXmQuestionAttDist",method=RequestMethod.GET) public Map getXmQuestionAttDist( @ApiIgnore @RequestParam Map xmQuestion){ User user=LoginUtils.getCurrentUserInfo(); - xmQuestion.put("branchId",user.getBranchId()); + xmQuestion.put("pbranchId",user.getBranchId()); List> datas= this.xmQuestionService.getXmQuestionAttDist(xmQuestion); return ResponseHelper.ok("ok","成功",datas); } @@ -130,14 +130,14 @@ public class XmQuestionController { @RequestMapping(value="/getXmQuestionAgeDist",method=RequestMethod.GET) public Map getXmQuestionAgeDist( @ApiIgnore @RequestParam Map xmQuestion){ User user=LoginUtils.getCurrentUserInfo(); - xmQuestion.put("branchId",user.getBranchId()); + xmQuestion.put("pbranchId",user.getBranchId()); List> datas= this.xmQuestionService.getXmQuestionAgeDist(xmQuestion); return ResponseHelper.ok("ok","成功",datas); } @RequestMapping(value="/getXmQuestionRetestDist",method=RequestMethod.GET) public Map getXmQuestionRetestDist( @ApiIgnore @RequestParam Map xmQuestion){ User user=LoginUtils.getCurrentUserInfo(); - xmQuestion.put("branchId",user.getBranchId()); + xmQuestion.put("pbranchId",user.getBranchId()); List> datas= this.xmQuestionService.getXmQuestionRetestDist(xmQuestion); return ResponseHelper.ok("ok","成功",datas); } @@ -145,7 +145,7 @@ public class XmQuestionController { public Map getXmQuestionSort( @ApiIgnore @RequestParam Map xmQuestion){ User user=LoginUtils.getCurrentUserInfo(); PageUtils.startPage(xmQuestion); - xmQuestion.put("branchId",user.getBranchId()); + xmQuestion.put("pbranchId",user.getBranchId()); List> datas= this.xmQuestionService.getXmQuestionSort(xmQuestion); Map m=new HashMap<>(); PageUtils.responePage(m,datas); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java index a860e4b4..e53f0c55 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java @@ -73,7 +73,7 @@ public class XmTestCasedbController { Tips tips=new Tips("查询成功"); RequestUtils.transformArray(xmTestCasedb, "ids"); User user=LoginUtils.getCurrentUserInfo(); - xmTestCasedb.put("cbranchId",user.getBranchId()); + xmTestCasedb.put("pbranchId",user.getBranchId()); PageUtils.startPage(xmTestCasedb); List> xmTestCasedbList = xmTestCasedbService.selectListMapByWhere(xmTestCasedb); //列出XmTestCasedb列表 PageUtils.responePage(m, xmTestCasedbList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java index 284a97a6..1442f6c0 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanCaseController.java @@ -76,6 +76,8 @@ public class XmTestPlanCaseController { Tips tips=new Tips("查询成功"); RequestUtils.transformArray(xmTestPlanCase, "pkList"); PageUtils.startPage(xmTestPlanCase); + User user= LoginUtils.getCurrentUserInfo(); + xmTestPlanCase.put("pbranchId",user.getBranchId()); List> xmTestPlanCaseList = xmTestPlanCaseService.selectListMapByWhere(xmTestPlanCase); //列出XmTestPlanCase列表 PageUtils.responePage(m, xmTestPlanCaseList); m.put("data",xmTestPlanCaseList); @@ -96,6 +98,8 @@ public class XmTestPlanCaseController { Map m = new HashMap<>(); Tips tips=new Tips("查询成功"); PageUtils.startPage(xmTestPlanCase); + User user= LoginUtils.getCurrentUserInfo(); + xmTestPlanCase.put("pbranchId",user.getBranchId()); List> xmTestPlanCaseList = xmTestPlanCaseService.getXmTestPlanCaseExecStatusDist(xmTestPlanCase); //列出XmTestPlanCase列表 PageUtils.responePage(m, xmTestPlanCaseList); m.put("data",xmTestPlanCaseList); @@ -114,6 +118,8 @@ public class XmTestPlanCaseController { Map m = new HashMap<>(); Tips tips=new Tips("查询成功"); PageUtils.startPage(xmTestPlanCase); + User user= LoginUtils.getCurrentUserInfo(); + xmTestPlanCase.put("pbranchId",user.getBranchId()); List> xmTestPlanCaseList = xmTestPlanCaseService.getXmTestPlanCaseUserDist(xmTestPlanCase); //列出XmTestPlanCase列表 PageUtils.responePage(m, xmTestPlanCaseList); m.put("data",xmTestPlanCaseList); @@ -132,6 +138,8 @@ public class XmTestPlanCaseController { Map m = new HashMap<>(); Tips tips=new Tips("查询成功"); PageUtils.startPage(xmTestPlanCase); + User user= LoginUtils.getCurrentUserInfo(); + xmTestPlanCase.put("pbranchId",user.getBranchId()); List> xmTestPlanCaseList = xmTestPlanCaseService.getXmTestDayTimesList(xmTestPlanCase); //列出XmTestPlanCase列表 PageUtils.responePage(m, xmTestPlanCaseList); m.put("data",xmTestPlanCaseList); @@ -148,6 +156,8 @@ public class XmTestPlanCaseController { Map m = new HashMap<>(); Tips tips=new Tips("查询成功"); PageUtils.startPage(xmTestPlanCase); + User user= LoginUtils.getCurrentUserInfo(); + xmTestPlanCase.put("pbranchId",user.getBranchId()); List> xmTestPlanCaseList = xmTestPlanCaseService.getXmTestCaseToPlanCalcList(xmTestPlanCase); //列出XmTestPlanCase列表 PageUtils.responePage(m, xmTestPlanCaseList); m.put("data",xmTestPlanCaseList);