8小时运营后台--

修复bug

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

@@ -896,7 +896,8 @@ public class CrmController {
 			// 当前用户管理的组
 			// 当前用户管理的组
 			List<Integer> gids = MyManageGroup(empNum, orgCode);
 			List<Integer> gids = MyManageGroup(empNum, orgCode);
 			List<CrmClientData> crmClientDatas = new ArrayList<CrmClientData>();
 			List<CrmClientData> crmClientDatas = new ArrayList<CrmClientData>();
-			for (Integer gid : gids) {
+			if(gids.size()>0) {
+                for (Integer gid : gids) {
 //				List<CrmClientData> datas = CrmClientData.builder().build().selectList(new QueryWrapper<CrmClientData>()
 //				List<CrmClientData> datas = CrmClientData.builder().build().selectList(new QueryWrapper<CrmClientData>()
 //						.lambda().eq(CrmClientData::getBelongGroup, gid)
 //						.lambda().eq(CrmClientData::getBelongGroup, gid)
 //						.eq(industry != null && industry > 0, CrmClientData::getIndustry,industry)
 //						.eq(industry != null && industry > 0, CrmClientData::getIndustry,industry)
@@ -912,12 +913,13 @@ public class CrmController {
 //						.like(!StrUtil.isBlank(like), CrmClientData::getClientName, like).or()
 //						.like(!StrUtil.isBlank(like), CrmClientData::getClientName, like).or()
 //						.like(!StrUtil.isBlank(like), CrmClientData::getClientCellphone, like));
 //						.like(!StrUtil.isBlank(like), CrmClientData::getClientCellphone, like));
 
 
-				List<CrmClientData> datas = crmClientDataMapper.getCrmClientData3(empNum, orgCode, groupId, status, like,startCreateTime,endCreateTime,startFollowTime,endFollowTime,type,ifPhone,customerowner,unfollowedDays,followNumber,industry);
+                    List<CrmClientData> datas = crmClientDataMapper.getCrmClientData3(empNum, orgCode, groupId, status, like, startCreateTime, endCreateTime, startFollowTime, endFollowTime, type, ifPhone, customerowner, unfollowedDays, followNumber, industry,gid);
 
 
 
 
-				for (CrmClientData data : datas)
-					crmClientDatas.add(data);
-			}
+                    for (CrmClientData data : datas)
+                        crmClientDatas.add(data);
+                }
+            }
 
 
             List<CrmClientData> result = getPageList(crmClientDatas, pageNumber, pageSize,
             List<CrmClientData> result = getPageList(crmClientDatas, pageNumber, pageSize,
                     Comparator.comparing(CrmClientData::getCreateTime).reversed());
                     Comparator.comparing(CrmClientData::getCreateTime).reversed());

src/main/java/cn/timer/api/dao/crm/CrmClientDataMapper.java

-/**  
-* <p>Title: CrmClientDataMapper.java</p>  
-* <p>Description: </p>  
-* @author dsc  
-* @date 2020年6月5日  
-* @version 1.0  
+/**
+* <p>Title: CrmClientDataMapper.java</p>
+* <p>Description: </p>
+* @author dsc
+* @date 2020年6月5日
+* @version 1.0
 */
 */
 package cn.timer.api.dao.crm;
 package cn.timer.api.dao.crm;
 
 
@@ -22,7 +22,7 @@ import cn.timer.api.dto.crm.CrmCartogramDto;
 
 
 /**
 /**
  * Title: CrmClientDataMapper.java Description:
  * Title: CrmClientDataMapper.java Description:
- * 
+ *
  * @author dsc
  * @author dsc
  * @date 2020年6月5日
  * @date 2020年6月5日
  * @version 1.0
  * @version 1.0
@@ -77,5 +77,5 @@ public interface CrmClientDataMapper extends BaseMapper<CrmClientData> {
 										   @Param("endFollowTime") String endFollowTime,@Param("type") Integer type,
 										   @Param("endFollowTime") String endFollowTime,@Param("type") Integer type,
 										  @Param("ifPhone") String ifPhone,@Param("customerowner") String customerowner,
 										  @Param("ifPhone") String ifPhone,@Param("customerowner") String customerowner,
 										   @Param("unfollowedDays") Integer unfollowedDays, @Param("followNumber") Integer followNumber,
 										   @Param("unfollowedDays") Integer unfollowedDays, @Param("followNumber") Integer followNumber,
-										   @Param("industry") Integer industry);
-}
+										   @Param("industry") Integer industry,@Param("gid")Integer gid);
+}
\ No newline at end of file