From c3997044ca4582504c02d73525703e5cdb84b8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 5 Aug 2022 11:41:01 +0800
Subject: [PATCH] rptConfig

---
 .../xm/core/ctrl/XmTestCasedbController.java  |  5 +---
 .../xm/core/ctrl/XmTestPlanController.java    | 24 ++++++++++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

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 197f0639..deac0717 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
@@ -273,10 +273,7 @@ public class XmTestCasedbController {
 
 			User user=LoginUtils.getCurrentUserInfo();
             for (XmTestCasedb data : datasDb) {
-				if(!user.getBranchId().equals(data.getCbranchId())){
-					return failed("cbranchId-err","该测试库不属于您企业，不能删除");
-				}
-                if(true){
+                if(user.getBranchId().equals(data.getCbranchId())){
                     can.add(data);
                 }else{
                     no.add(data);
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java
index 67122654..219e0c41 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestPlanController.java
@@ -61,9 +61,7 @@ public class XmTestPlanController {
 		Tips tips=new Tips("查询成功");
 		RequestUtils.transformArray(xmTestPlan, "ids");
 		User user=LoginUtils.getCurrentUserInfo();
-		if(!user.getBranchId().equals(xmTestCasedbDb.getCbranchId())){
-			return failed("cbranchId-err","该测试库不属于您企业，不能修改");
-		}
+		xmTestPlan.put("cbranchId",user.getBranchId());
 		PageUtils.startPage(xmTestPlan);
 		List<Map<String,Object>>	xmTestPlanList = xmTestPlanService.selectListMapByWhere(xmTestPlan);	//列出XmTestPlan列表
 		PageUtils.responePage(m, xmTestPlanList);
@@ -109,6 +107,7 @@ public class XmTestPlanController {
 			xmTestPlan.setCuserid(user.getUserid());
 			xmTestPlan.setCusername(user.getUsername());
 			xmTestPlan.setCtime(new Date());
+			xmTestPlan.setCbranchId(user.getBranchId());
 			xmTestPlanService.insert(xmTestPlan);
 			m.put("data",xmTestPlan);
 		}catch (BizException e) { 
@@ -138,6 +137,10 @@ public class XmTestPlanController {
             if( xmTestPlanDb == null ){
                 return failed("data-not-exists","数据不存在，无法删除");
             }
+            User user=LoginUtils.getCurrentUserInfo();
+            if(!user.getBranchId().equals(xmTestPlanDb.getCbranchId())){
+            	return failed("cbranchId-err","该计划不属于您的企业创建，无权删除");
+			}
 			xmTestPlanService.deleteByPk(xmTestPlan);
 		}catch (BizException e) { 
 			tips=e.getTips();
@@ -166,6 +169,10 @@ public class XmTestPlanController {
             if( xmTestPlanDb == null ){
                 return failed("data-not-exists","数据不存在，无法修改");
             }
+			User user=LoginUtils.getCurrentUserInfo();
+			if(!user.getBranchId().equals(xmTestPlanDb.getCbranchId())){
+				return failed("cbranchId-err","该计划不属于您的企业创建，无权修改");
+			}
 			xmTestPlanService.updateSomeFieldByPk(xmTestPlan);
 			m.put("data",xmTestPlan);
 		}catch (BizException e) { 
@@ -216,7 +223,11 @@ public class XmTestPlanController {
 			List<XmTestPlan> no=new ArrayList<>();
 			User user = LoginUtils.getCurrentUserInfo();
 			for (XmTestPlan xmTestPlanDb : xmTestPlansDb) {
-				Tips tips2 = new Tips("检查通过"); 
+				Tips tips2 = new Tips("检查通过");
+
+				if(!user.getBranchId().equals(xmTestPlanDb.getCbranchId())){
+					return failed("cbranchId-err","该计划不属于您的企业创建，无权修改");
+				}
 				if(!tips2.isOk()){
 				    no.add(xmTestPlanDb); 
 				}else{
@@ -267,8 +278,9 @@ public class XmTestPlanController {
 
             List<XmTestPlan> can=new ArrayList<>();
             List<XmTestPlan> no=new ArrayList<>();
-            for (XmTestPlan data : datasDb) {
-                if(true){
+			User user=LoginUtils.getCurrentUserInfo();
+			for (XmTestPlan data : datasDb) {
+                if(user.getBranchId().equals(data.getCbranchId())){
                     can.add(data);
                 }else{
                     no.add(data);