用例规划

xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java

@@ -62,6 +62,8 @@ public class XmBranchStateController {
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmBranchState, "ids");
 		PageUtils.startPage(xmBranchState);
+		User user=LoginUtils.getCurrentUserInfo();
+		xmBranchState.put("branchId",user.getBranchId());
 		List<Map<String,Object>>	xmBranchStateList = xmBranchStateService.selectListMapByWhere(xmBranchState);	//列出XmBranchState列表
 		PageUtils.responePage(m, xmBranchStateList);
 		m.put("data",xmBranchStateList);

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<Map<String,Object>>	xmBranchStateHisList = xmBranchStateHisService.selectListMapByWhere(xmBranchStateHis);	//列出XmBranchStateHis列表
 		PageUtils.responePage(m, xmBranchStateHisList);
 		m.put("data",xmBranchStateHisList);

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<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmProductState, "ids");
 		PageUtils.startPage(xmProductState);
+		User user= LoginUtils.getCurrentUserInfo();
+		xmProductState.put("branchId",user.getBranchId());
 		List<Map<String,Object>>	xmProductStateList = xmProductStateService.selectListMapByWhere(xmProductState);	//列出XmProductState列表
 		PageUtils.responePage(m, xmProductStateList);
 		m.put("data",xmProductStateList);

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<Map<String,Object>>	xmProductStateHisList = xmProductStateHisService.selectListMapByWhere(xmProductStateHis);	//列出XmProductStateHis列表
 		PageUtils.responePage(m, xmProductStateHisList);
 		m.put("data",xmProductStateHisList);

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<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmProjectState, "ids");
 		PageUtils.startPage(xmProjectState);
+		User user= LoginUtils.getCurrentUserInfo();
+		xmProjectState.put("branchId",user.getBranchId());
 		List<Map<String,Object>>	xmProjectStateList = xmProjectStateService.selectListMapByWhere(xmProjectState);	//列出XmProjectState列表
 		PageUtils.responePage(m, xmProjectStateList);
 		m.put("data",xmProjectStateList);

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<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmProjectStateHis, "ids");
 		PageUtils.startPage(xmProjectStateHis);
+		User user= LoginUtils.getCurrentUserInfo();
+		xmProjectStateHis.put("branchId",user.getBranchId());
 		List<Map<String,Object>>	xmProjectStateHisList = xmProjectStateHisService.selectListMapByWhere(xmProjectStateHis);	//列出XmProjectStateHis列表
 		PageUtils.responePage(m, xmProjectStateHisList);
 		m.put("data",xmProjectStateHisList);

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<String,Object> getXmQuestionAttDist( @ApiIgnore @RequestParam Map<String,Object> xmQuestion){
 		User user=LoginUtils.getCurrentUserInfo();
-		xmQuestion.put("branchId",user.getBranchId());
+		xmQuestion.put("pbranchId",user.getBranchId());
 		List<Map<String,Object>> 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<String,Object> getXmQuestionAgeDist( @ApiIgnore @RequestParam Map<String,Object> xmQuestion){
 		User user=LoginUtils.getCurrentUserInfo();
-		xmQuestion.put("branchId",user.getBranchId());
+		xmQuestion.put("pbranchId",user.getBranchId());
 		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionAgeDist(xmQuestion);
 		return ResponseHelper.ok("ok","成功",datas);
 	}
 	@RequestMapping(value="/getXmQuestionRetestDist",method=RequestMethod.GET)
 	public Map<String,Object> getXmQuestionRetestDist( @ApiIgnore @RequestParam Map<String,Object> xmQuestion){
 		User user=LoginUtils.getCurrentUserInfo();
-		xmQuestion.put("branchId",user.getBranchId());
+		xmQuestion.put("pbranchId",user.getBranchId());
 		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionRetestDist(xmQuestion);
 		return ResponseHelper.ok("ok","成功",datas);
 	}
@@ -145,7 +145,7 @@ public class XmQuestionController {
 	public Map<String,Object> getXmQuestionSort( @ApiIgnore @RequestParam Map<String,Object> xmQuestion){
 		User user=LoginUtils.getCurrentUserInfo();
 		PageUtils.startPage(xmQuestion);
-		xmQuestion.put("branchId",user.getBranchId());
+		xmQuestion.put("pbranchId",user.getBranchId());
 		List<Map<String,Object>> datas= this.xmQuestionService.getXmQuestionSort(xmQuestion);
 		Map<String,Object> m=new HashMap<>();
 		PageUtils.responePage(m,datas);

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<Map<String,Object>>	xmTestCasedbList = xmTestCasedbService.selectListMapByWhere(xmTestCasedb);	//列出XmTestCasedb列表
 		PageUtils.responePage(m, xmTestCasedbList);

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<Map<String,Object>>	xmTestPlanCaseList = xmTestPlanCaseService.selectListMapByWhere(xmTestPlanCase);	//列出XmTestPlanCase列表
 		PageUtils.responePage(m, xmTestPlanCaseList);
 		m.put("data",xmTestPlanCaseList);
@@ -96,6 +98,8 @@ public class XmTestPlanCaseController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("查询成功");
 		PageUtils.startPage(xmTestPlanCase);
+		User user= LoginUtils.getCurrentUserInfo();
+		xmTestPlanCase.put("pbranchId",user.getBranchId());
 		List<Map<String,Object>>	xmTestPlanCaseList = xmTestPlanCaseService.getXmTestPlanCaseExecStatusDist(xmTestPlanCase);	//列出XmTestPlanCase列表
 		PageUtils.responePage(m, xmTestPlanCaseList);
 		m.put("data",xmTestPlanCaseList);
@@ -114,6 +118,8 @@ public class XmTestPlanCaseController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("查询成功");
 		PageUtils.startPage(xmTestPlanCase);
+		User user= LoginUtils.getCurrentUserInfo();
+		xmTestPlanCase.put("pbranchId",user.getBranchId());
 		List<Map<String,Object>>	xmTestPlanCaseList = xmTestPlanCaseService.getXmTestPlanCaseUserDist(xmTestPlanCase);	//列出XmTestPlanCase列表
 		PageUtils.responePage(m, xmTestPlanCaseList);
 		m.put("data",xmTestPlanCaseList);
@@ -132,6 +138,8 @@ public class XmTestPlanCaseController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("查询成功");
 		PageUtils.startPage(xmTestPlanCase);
+		User user= LoginUtils.getCurrentUserInfo();
+		xmTestPlanCase.put("pbranchId",user.getBranchId());
 		List<Map<String,Object>>	xmTestPlanCaseList = xmTestPlanCaseService.getXmTestDayTimesList(xmTestPlanCase);	//列出XmTestPlanCase列表
 		PageUtils.responePage(m, xmTestPlanCaseList);
 		m.put("data",xmTestPlanCaseList);
@@ -148,6 +156,8 @@ public class XmTestPlanCaseController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("查询成功");
 		PageUtils.startPage(xmTestPlanCase);
+		User user= LoginUtils.getCurrentUserInfo();
+		xmTestPlanCase.put("pbranchId",user.getBranchId());
 		List<Map<String,Object>>	xmTestPlanCaseList = xmTestPlanCaseService.getXmTestCaseToPlanCalcList(xmTestPlanCase);	//列出XmTestPlanCase列表
 		PageUtils.responePage(m, xmTestPlanCaseList);
 		m.put("data",xmTestPlanCaseList);