缺陷回归分布

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

@@ -97,6 +97,7 @@ public class XmFuncController {
 			if(words!=null && words.size()>0){
 				return failed("name-sensitive-word","名字有敏感词"+words+",请修改后再提交");
 			}
+
 			xmFuncService.parentIdPathsCalcBeforeSave(xmFunc);
 			xmFuncService.insert(xmFunc);
 			m.put("data",xmFunc);

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

@@ -201,7 +201,6 @@ public class XmIterationController {
 			xmIteration.setCtime(new Date());
 			xmIteration.setCuserid(user.getUserid());
 			xmIteration.setCusername(user.getUsername());
-			xmIteration.setBranchId(user.getBranchId());
 			xmIteration.setIstatus("0");
 			xmIteration.setIphase("0");
 			XmProduct xmProductDb=xmProductService.getProductFromCache(xmIteration.getProductId());
@@ -209,6 +208,9 @@ public class XmIterationController {
 			if(!tips.isOk()){
 				return failed(tips);
 			}
+
+			xmIteration.setBranchId(xmProductDb.getBranchId());
+
 			if(!StringUtils.hasText(xmIteration.getAdminUserid())){
 				xmIteration.setAdminUserid(user.getUserid());
 				xmIteration.setAdminUsername(user.getUsername());

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

@@ -9,7 +9,6 @@ import com.mdp.core.utils.RequestUtils;
 import com.mdp.core.utils.ResponseHelper;
 import com.mdp.msg.client.PushNotifyMsgService;
 import com.mdp.mybatis.PageUtils;
-import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.sensitive.SensitiveWordService;
@@ -307,6 +306,7 @@ public class XmMenuController {
 			xmMenuService.parentIdPathsCalcBeforeSave(xmMenu);
 			xmMenu.setStatus("0");
 			xmMenu.setChildrenCnt(0);
+			xmMenu.setPbranchId(xmProduct.getBranchId());
 			if(!StringUtils.hasText(xmMenu.getProposerId())){
 				xmMenu.setProposerId(user.getUserid());
 				xmMenu.setProposerName(user.getUsername());
@@ -462,6 +462,7 @@ public class XmMenuController {
 			fields.add("ntype");
 			fields.add("pidPaths");
 			fields.add("pmenuId");
+			fields.add("pbranchId");
 			for (String fieldName : xmMenuMap.keySet()) {
 				if(fields.contains(fieldName)){
 					return ResponseHelper.failed(fieldName+"-no-edit",fieldName+"不允许修改");

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

@@ -194,6 +194,13 @@ public class XmQuestionController {
 			if(!tips.isOk()){
 				return failed(tips);
 			}
+			if(StringUtils.hasText(xmQuestionVo.getProjectId())){
+				XmProject xmProject=projectService.getProjectFromCache(xmQuestionVo.getProjectId() );
+				xmQuestionVo.setPbranchId(xmProject.getBranchId());
+			}else if(StringUtils.hasText(xmQuestionVo.getProductId())){
+				XmProduct xmProduct=productService.getProductFromCache(xmQuestionVo.getProductId() );
+				xmQuestionVo.setPbranchId(xmProduct.getBranchId());
+			}
 
 			xmQuestionService.addQuestion(xmQuestionVo);
 			if(!StringUtils.isEmpty(xmQuestionVo.getHandlerUserid())) {
@@ -513,10 +520,13 @@ public class XmQuestionController {
 
 
 	public Tips checkOneQx(String projectId,String productId){
+		Tips tips1=new Tips("成功");
 		User user=LoginUtils.getCurrentUserInfo();
-		XmProject xmProject=projectService.getProjectFromCache(projectId );
-		Tips tips1 = this.projectQxService.checkProjectQx(xmProject,1,user);
-		if(!tips1.isOk()){
+		if(StringUtils.hasText(projectId)){
+			XmProject xmProject=projectService.getProjectFromCache(projectId );
+			tips1 = this.projectQxService.checkProjectQx(xmProject,1,user);
+		}
+		if((StringUtils.hasText(projectId) && !tips1.isOk()) || !StringUtils.hasText(projectId)){
 			if(StringUtils.hasText(productId)){
 				XmProduct xmProduct=productService.getProductFromCache(productId);
 				tips1=this.productQxService.checkProductQx(xmProduct,1,user);

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

@@ -11,7 +11,6 @@ import com.mdp.core.utils.RequestUtils;
 import com.mdp.core.utils.ResponseHelper;
 import com.mdp.msg.client.PushNotifyMsgService;
 import com.mdp.mybatis.PageUtils;
-import com.mdp.qx.HasQx;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.sensitive.SensitiveWordService;
@@ -584,7 +583,7 @@ public class XmTaskController {
 				}
 			}
 
-
+			xmTaskVo.setPbranchId(xmProject.getBranchId());
 			xmTaskVo.setExecutorUserid(null);
 			xmTaskVo.setExecutorUsername(null);
 			xmTaskVo.setExeUserids(null);
@@ -1001,6 +1000,8 @@ public class XmTaskController {
 						}
 					}
 				}
+ 				g.setCbranchId(user.getBranchId());
+ 				g.setPbranchId(xmProject.getBranchId());
 				g.setCreateUserid(user.getUserid());
 				g.setCreateUsername(user.getUsername());
 				g.setExecutorUserid(null);

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

@@ -131,6 +131,7 @@ public class XmTestCaseController {
 			if(!StringUtils.hasText(xmTestCase.getCbranchId())){
 				xmTestCase.setCbranchId(user.getBranchId());
 			}
+			xmTestCase.setPbranchId(xmProductDb.getBranchId());
 			xmTestCase.setLusername(user.getUsername());
 			xmTestCase.setCusername(user.getUsername());
 			xmTestCase.setCtime(new Date());

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

@@ -116,6 +116,7 @@ public class XmTestCasedbController {
 					return failed(tips);
 				}
 			}
+			xmTestCasedb.setPbranchId(xmProductDb.getBranchId());
 			xmTestCasedb.setCtime(new Date());
 			xmTestCasedb.setCuserid(user.getUserid());
 			xmTestCasedb.setCusername(user.getUsername());

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

@@ -149,6 +149,7 @@ public class XmTestPlanController {
 					return failed(tips);
 				}
  			}
+			xmTestPlan.setPbranchId(xmProductDb.getBranchId());
 			xmTestPlan.setCuserid(user.getUserid());
 			xmTestPlan.setCusername(user.getUsername());
 			xmTestPlan.setCtime(new Date());