Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!565

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -1107,7 +1107,14 @@ public class CrmController {
 				.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode())
 				.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode())
 				.in(QyzxEmpEntAsso::getUserType, "0,1")
 				.in(QyzxEmpEntAsso::getUserType, "0,1")
 				.count();
 				.count();
-		if(count > 0) {
+		
+		// 当前操作人是否管理员
+		CrmBusinessGroupMember nowManager = CrmBusinessGroupMember.builder().build()
+				.selectOne(new QueryWrapper<CrmBusinessGroupMember>().lambda().eq(CrmBusinessGroupMember::getGid, gid)
+						.eq(CrmBusinessGroupMember::getEmpNum, getEmpNum(userBean))
+						.eq(CrmBusinessGroupMember::getType, 1));
+		//系统主管理员 或者 组管理员
+		if(count > 0 || nowManager != null) {
 			
 			
 			// 是否有不同组的客户
 			// 是否有不同组的客户
 			if (gids.stream().distinct().count() > 1)
 			if (gids.stream().distinct().count() > 1)
@@ -1128,15 +1135,16 @@ public class CrmController {
 		}
 		}
 		
 		
 		// 当前操作人是否管理员
 		// 当前操作人是否管理员
-		CrmBusinessGroupMember nowManager = CrmBusinessGroupMember.builder().build()
-				.selectOne(new QueryWrapper<CrmBusinessGroupMember>().lambda().eq(CrmBusinessGroupMember::getGid, gid)
-						.eq(CrmBusinessGroupMember::getEmpNum, getEmpNum(userBean))
-						.eq(CrmBusinessGroupMember::getType, 1));
+//		CrmBusinessGroupMember nowManager = CrmBusinessGroupMember.builder().build()
+//				.selectOne(new QueryWrapper<CrmBusinessGroupMember>().lambda().eq(CrmBusinessGroupMember::getGid, gid)
+//						.eq(CrmBusinessGroupMember::getEmpNum, getEmpNum(userBean))
+//						.eq(CrmBusinessGroupMember::getType, 1));
+		
 		if (nowManager == null)
 		if (nowManager == null)
 			return ResultUtil.error("没有操作权限，请联系组管理员进行操作");
 			return ResultUtil.error("没有操作权限，请联系组管理员进行操作");
 		
 		
 		
 		
-		return ResultUtil.success("转移成功");
+		return ResultUtil.success("转移失败");
 	}
 	}
 
 
 	/**
 	/**