Merge branch 'lal' into 'develop'

提交

See merge request 8timerv2/8timerapiv200!492

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

@@ -50,6 +50,7 @@ import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.CurrentUser;
 import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.config.annotation.UserBean;
 import cn.timer.api.config.enums.SysRoleType;
 import cn.timer.api.config.enums.SysRoleType;
+import cn.timer.api.controller.kqgl.ClockInTool;
 import cn.timer.api.dao.crm.CrmClientContactsMapper;
 import cn.timer.api.dao.crm.CrmClientContactsMapper;
 import cn.timer.api.dao.crm.CrmClientDataMapper;
 import cn.timer.api.dao.crm.CrmClientDataMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
 import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
@@ -634,15 +635,22 @@ public class CrmController {
 			BeanUtil.copyProperties(crmd, crmdts , "iscooperation");
 			BeanUtil.copyProperties(crmd, crmdts , "iscooperation");
 			List<CrmClientAssociate> crmClientAssociates = CrmClientAssociate.builder().build()
 			List<CrmClientAssociate> crmClientAssociates = CrmClientAssociate.builder().build()
 					.selectList(new QueryWrapper<CrmClientAssociate>().lambda().eq(CrmClientAssociate::getCid, crmd.getId()));
 					.selectList(new QueryWrapper<CrmClientAssociate>().lambda().eq(CrmClientAssociate::getCid, crmd.getId()));
+			int u = 0;
 			if(crmClientAssociates.size() > 0) {
 			if(crmClientAssociates.size() > 0) {
+				String[] collaborator = new String[crmClientAssociates.size()];
+				
 				for (CrmClientAssociate crmClientAssociate : crmClientAssociates) {
 				for (CrmClientAssociate crmClientAssociate : crmClientAssociates) {
 					Integer empNum1 = crmClientAssociate.getAssociateId();
 					Integer empNum1 = crmClientAssociate.getAssociateId();
-					if(userBean.getEmpNum().equals(empNum1)) {
-						crmdts.setIscooperation(1);
-					}else {
-						crmdts.setIscooperation(0);
-					}
+					collaborator[u] = String.valueOf(empNum1);
+					u++;
 				}
 				}
+				
+				if(ClockInTool.contains(ClockInTool.deleteArrayNull(collaborator),String.valueOf(userBean.getEmpNum()))) {
+					crmdts.setIscooperation(1);
+				}else {
+					crmdts.setIscooperation(0);
+				}
+				
 			}else {
 			}else {
 				crmdts.setIscooperation(0);
 				crmdts.setIscooperation(0);
 			}
 			}