Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!301

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

@@ -442,8 +442,9 @@ public class CrmController {
 				crmClientContact.insertOrUpdate();
 			}
 		}
-		
-		crmClientData.setContactsNum(crmClientContacts.size());//客户联系人数量
+		if(crmClientContacts != null) {
+			crmClientData.setContactsNum(crmClientContacts.size());//客户联系人数量
+		}
 		
 		List<CrmClientAssociate> oldAssociates = CrmClientAssociate.builder().build()
 				.selectList(new QueryWrapper<CrmClientAssociate>().lambda().eq(CrmClientAssociate::getCid, cid));
@@ -697,19 +698,57 @@ public class CrmController {
 						|| qyzxEmpEntAsso.getUserType() == SysRoleType.U_TYPE_C_ADMIN.getType())) {
 
 			IPage<CrmClientData> page = new Page<CrmClientData>(pageNumber, pageSize);
-
-			IPage<CrmClientData> datas = CrmClientData.builder().build().selectPage(page,
-					new QueryWrapper<CrmClientData>().lambda().eq(CrmClientData::getOrgCode, orgCode)
-							.eq(groupId != null && groupId >= 0, CrmClientData::getBelongGroup, groupId)
-							.eq(type != null && type >= 0, CrmClientData::getClientType, type)
-							.eq(status != null && status >= 0, CrmClientData::getClientStatus, status)
-							.ge(StringUtils.isNotBlank(startCreateTime), CrmClientData::getCreateTime, startCreateTime)
-							.le(StringUtils.isNotBlank(endCreateTime), CrmClientData::getCreateTime, endCreateTime)
-							.ge(StringUtils.isNotBlank(startFollowTime), CrmClientData::getCreateTime, startFollowTime)
-							.le(StringUtils.isNotBlank(endFollowTime), CrmClientData::getCreateTime, endFollowTime)
-							.like(!StrUtil.isBlank(like), CrmClientData::getClientName, like).or()
-							.like(!StrUtil.isBlank(like), CrmClientData::getClientCellphone, like)
-							.orderByDesc(CrmClientData::getCreateTime));
+			
+			
+			List<CrmBusinessGroupMember> grouplis = CrmBusinessGroupMember.builder().build().selectList(new QueryWrapper<CrmBusinessGroupMember>().lambda().eq(CrmBusinessGroupMember::getEmpNum, userBean.getEmpNum())
+					.eq(CrmBusinessGroupMember::getOrgCode, userBean.getOrgCode()));
+			
+			String keywordStr = "";
+			
+			IPage<CrmClientData> datas;
+			
+			Integer count = new LambdaQueryChainWrapper<QyzxEmpEntAsso>(qyzxEmpEntAssoMapper)
+					.eq(QyzxEmpEntAsso::getEmpNum, userBean.getEmpNum())
+					.eq(QyzxEmpEntAsso::getOrgCode, userBean.getOrgCode())
+					.in(QyzxEmpEntAsso::getUserType, "0,1")
+					.count();
+			if(count > 0) {
+				
+				datas = CrmClientData.builder().build().selectPage(page,
+						new QueryWrapper<CrmClientData>().lambda().eq(CrmClientData::getOrgCode, orgCode)
+								.eq(groupId != null && groupId >= 0, CrmClientData::getBelongGroup, groupId)
+								.eq(type != null && type >= 0, CrmClientData::getClientType, type)
+								.eq(status != null && status >= 0, CrmClientData::getClientStatus, status)
+								.ge(StringUtils.isNotBlank(startCreateTime), CrmClientData::getCreateTime, startCreateTime)
+								.le(StringUtils.isNotBlank(endCreateTime), CrmClientData::getCreateTime, endCreateTime)
+								.ge(StringUtils.isNotBlank(startFollowTime), CrmClientData::getCreateTime, startFollowTime)
+								.le(StringUtils.isNotBlank(endFollowTime), CrmClientData::getCreateTime, endFollowTime)
+								.like(!StrUtil.isBlank(like), CrmClientData::getClientName, like).or()
+								.like(!StrUtil.isBlank(like), CrmClientData::getClientCellphone, like)
+								.orderByDesc(CrmClientData::getCreateTime));
+			}else {
+				if(grouplis.size()>0 && grouplis != null) {
+					StringBuffer sb = new StringBuffer();
+					for(CrmBusinessGroupMember grp : grouplis) {
+						sb.append(grp.getGid()).append(",");
+					}
+					keywordStr = sb.deleteCharAt(sb.length() - 1).toString();
+				}
+				
+				datas = CrmClientData.builder().build().selectPage(page,
+						new QueryWrapper<CrmClientData>().lambda().eq(CrmClientData::getOrgCode, orgCode)
+								.eq(groupId != null && groupId >= 0, CrmClientData::getBelongGroup, groupId)
+								.eq(type != null && type >= 0, CrmClientData::getClientType, type)
+								.eq(status != null && status >= 0, CrmClientData::getClientStatus, status).in(CrmClientData::getBelongGroup, keywordStr)
+								.ge(StringUtils.isNotBlank(startCreateTime), CrmClientData::getCreateTime, startCreateTime)
+								.le(StringUtils.isNotBlank(endCreateTime), CrmClientData::getCreateTime, endCreateTime)
+								.ge(StringUtils.isNotBlank(startFollowTime), CrmClientData::getCreateTime, startFollowTime)
+								.le(StringUtils.isNotBlank(endFollowTime), CrmClientData::getCreateTime, endFollowTime)
+								.like(!StrUtil.isBlank(like), CrmClientData::getClientName, like).or()
+								.like(!StrUtil.isBlank(like), CrmClientData::getClientCellphone, like)
+								.orderByDesc(CrmClientData::getCreateTime));
+			}
+			
 
 			return ResultUtil.pageData(datas.getRecords(), datas.getTotal(), "查询成功");
 		} else {

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -304,8 +304,8 @@ public class SpmkController {
 	@ApiOperationSupport(order = 10)
 	public Result<Object> deleteAgById(@PathVariable int id){
 		
-		if (spmkCustomApprovalMapper.selectCount(new QueryWrapper<SpmkCustomApproval>().lambda().eq(SpmkCustomApproval::getApprovalGId, id)) > 0 ) 
-			return ResultUtil.error("审批组存在 自定义审批,不可直接删除!");
+//		if (spmkCustomApprovalMapper.selectCount(new QueryWrapper<SpmkCustomApproval>().lambda().eq(SpmkCustomApproval::getApprovalGId, id)) > 0 ) 
+//			return ResultUtil.error("审批组存在 自定义审批,不可直接删除!");
 		
         return SpmkApprovalG.builder().id(id).build().deleteById() ? ResultUtil.success() : ResultUtil.error("没有找到该对象");
 		

src/main/resources/mapping/spmk/SpmkApprovalGMapper.xml

@@ -75,8 +75,8 @@
         LEFT JOIN spmk_custom_approval b 
         ON a.id = b.approval_g_id 
         WHERE a.org_code = #{org_code}  
-        ORDER BY a.ranks, b.ranks
-    </select>
+        ORDER BY a.ranks, b.ranks,b.id DESC
+    </select> 
     
     <select id="selectListAgInCa" resultMap="BaseResultMapDto">
         SELECT