Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!352

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

@@ -904,9 +904,22 @@ public class CrmController {
 		CrmClientData crmClientData = CrmClientData.builder().id(cid).build().selectById();
 		CrmClientData crmClientData = CrmClientData.builder().id(cid).build().selectById();
 		if (crmClientData == null)
 		if (crmClientData == null)
 			return ResultUtil.error("请确认该客户是否存在");
 			return ResultUtil.error("请确认该客户是否存在");
+		
+		
+		QyzxEmpEntAsso ent = QyzxEmpEntAsso.builder().build().selectOne(new QueryWrapper<QyzxEmpEntAsso>().lambda().eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode()).eq(QyzxEmpEntAsso::getEmpNum, userBean.getEmpNum()));
+		if(ent != null) {
+			if(ent.getUserType() == 2) {
 				if (!crmClientData.getBelongUser().equals(empNum)
 				if (!crmClientData.getBelongUser().equals(empNum)
 						&& getGroupManager(crmClientData.getBelongGroup(), empNum) == null)
 						&& getGroupManager(crmClientData.getBelongGroup(), empNum) == null)
 					return ResultUtil.error("不是当前客户归属人或组管理员");
 					return ResultUtil.error("不是当前客户归属人或组管理员");
+			}
+		}
+		
+//		if (!crmClientData.getBelongUser().equals(empNum)
+//				&& getGroupManager(crmClientData.getBelongGroup(), empNum) == null)
+//			return ResultUtil.error("不是当前客户归属人或组管理员");
+		
+		
 		Integer status = crmClientData.getClientStatus();
 		Integer status = crmClientData.getClientStatus();
 		if (status != null && status != 5) {
 		if (status != null && status != 5) {
 			crmClientData.setClientStatus(5);
 			crmClientData.setClientStatus(5);