From f27cc8614887be2071beacbc0d4310ace9ef8fc6 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, 20 Jan 2023 18:35:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xm/core/service/XmGroupService.java   | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/service/XmGroupService.java b/xm-core/src/main/java/com/xm/core/service/XmGroupService.java
index 439b0b84..7340b4bc 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmGroupService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmGroupService.java
@@ -160,7 +160,7 @@ public class XmGroupService extends BaseService {
 	 * @return
 	 */
 	public Tips checkProductQx(XmProduct xmProduct,int teamType,User head){
-		Tips tips=new Tips();
+		Tips tips=new Tips("成功");
 		boolean headIsPm=this.checkUserIsProductAdm(xmProduct,head.getUserid());
 		if(headIsPm){
 			return tips;
@@ -172,11 +172,7 @@ public class XmGroupService extends BaseService {
 		return this.checkProductTransmitQx(xmProduct,teamType,head.getUserid(),head.getUserid());
 	}
 	public Tips checkProductQx(XmProduct xmProduct,int teamType,User head,String ...memUserids){
-		Tips tips=new Tips("成功");
-		boolean headIsPm=this.checkUserIsProductAdm(xmProduct,head.getUserid());
-		if(headIsPm){
-			return tips;
-		}
+		Tips tips=new Tips("成功"); 
 		tips=this.checkProductScopeQx(xmProduct,teamType,head,memUserids);
 		if(!tips.isOk()){
 			return tips;
@@ -184,7 +180,7 @@ public class XmGroupService extends BaseService {
 		return this.checkProductTransmitQx(xmProduct,teamType,head.getUserid(),memUserids);
 	}
 	public Tips checkProductScopeQx(XmProduct xmProduct,int teamType,User head,String ...memUserids){
-		Tips tips=new Tips();
+		Tips tips=new Tips("成功");
 
 		if(memUserids==null || memUserids.length==0){
 			return this.checkProductScopeQx(xmProduct,teamType,head.getUserid(),head.getUsername(),head.getBranchId());
@@ -275,7 +271,7 @@ public class XmGroupService extends BaseService {
 	 * @return
 	 */
 	public Tips checkProductScopeQx(XmProduct xmProduct,int teamType,String userid,String username,String ubranchId){
-		Tips tips=new Tips();
+		Tips tips=new Tips("成功");
 		String scopeQx= QxTool.getProductScopeQx(xmProduct.getQxCode(),teamType);
 		boolean isPm=this.checkUserIsProductAdm(xmProduct,userid);
 		if(isPm){
@@ -317,7 +313,7 @@ public class XmGroupService extends BaseService {
 	}
 
 	public Tips checkProductTransmitQx(XmProduct xmProduct,int teamType,String headUserid,String ...memUserids){
-		Tips tips=new Tips();
+		Tips tips=new Tips("成功");
 		String transmitQx= QxTool.getProductTransmitQx(xmProduct.getQxCode(),teamType);
 		if("0".equals(transmitQx)){//不检查上下级关系
 			return tips;
@@ -350,7 +346,7 @@ public class XmGroupService extends BaseService {
 	 * @return
 	 */
 	public Tips checkProjectQx(XmProject xmProject,User head){
-		Tips tips=new Tips();
+		Tips tips=new Tips("成功");
 		boolean headIsPm=this.checkUserIsProjectAdm(xmProject,head.getUserid());
 		if(headIsPm){
 			return tips;
@@ -374,7 +370,7 @@ public class XmGroupService extends BaseService {
 		return this.checkProjectTransmitQx(xmProject,head.getUserid(),memUserids);
 	}
 	public Tips checkProjectScopeQx(XmProject xmProject,User head,String ...memUserids){
-		Tips tips=new Tips();
+		Tips tips=new Tips("成功");
 
 		if(memUserids==null || memUserids.length==0){
 			return this.checkProjectScopeQx(xmProject,head.getUserid(),head.getUsername(),head.getBranchId());
@@ -464,7 +460,7 @@ public class XmGroupService extends BaseService {
 	 * @return
 	 */
 	public Tips checkProjectScopeQx(XmProject xmProject,String userid,String username,String ubranchId){
-		Tips tips=new Tips();
+		Tips tips=new Tips("成功");
 		String scopeQx= QxTool.getProjectScopeQx(xmProject.getQxCode());
 		boolean isPm=this.checkUserIsProjectAdm(xmProject,userid);
 		if(isPm){
@@ -506,7 +502,7 @@ public class XmGroupService extends BaseService {
 	}
 
 	public Tips checkProjectTransmitQx(XmProject xmProject,String headUserid,String ...memUserids){
-		Tips tips=new Tips();
+		Tips tips=new Tips("成功");
 		String transmitQx= QxTool.getProjectTransmitQx(xmProject.getQxCode());
 		if("0".equals(transmitQx)){//不检查上下级关系
 			return tips;