Merge branch 'feature/社群' into 'developer'

Feature/社群

See merge request !713

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/chat/GroupChatApiServiceImpl.java

@@ -219,9 +219,9 @@ public class GroupChatApiServiceImpl implements GroupChatApiService {
     public ServiceResponse<Boolean> getSetGicFlag(String wxEnterpriseId) {
         List<TabHaobanWxEnterpriseRelated> list = this.wxEnterpriseRelatedService.getByWxEnterpriseId(wxEnterpriseId);
         if (CollectionUtils.isNotEmpty(list) && list.size() == 1) {
-            return ServiceResponse.success(Boolean.TRUE);
+            return ServiceResponse.success(Boolean.FALSE);
         }
-        return ServiceResponse.success(Boolean.FALSE);
+        return ServiceResponse.success(Boolean.TRUE);
     }
 
     @Override

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -163,18 +163,20 @@ public class StaffController extends WebBaseController {
         Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo, relationFlag, wxEnterpriseId);
 
         logger.info("pages={},totalPage={}", page.getCurrentPage(), page.getTotalPage());
-        page.getResult().forEach(staff->{
-            Integer activiveFlag = staff.getActiveFlag();
-            Integer openConcatFlag = staff.getOpenConcatFlag();
-            String remark ="" ;
-            if (activiveFlag == 0) {
-                remark = "未激活";
-            } else if (openConcatFlag == 0) {
-                remark = "未配置客户联系功能";
-            }
-            staff.setOwnerRemark(remark);
-            
-        });
+        if(CollectionUtils.isNotEmpty(page.getResult())) {
+            page.getResult().forEach(staff->{
+                Integer activiveFlag = staff.getActiveFlag();
+                Integer openConcatFlag = staff.getOpenConcatFlag();
+                String remark ="" ;
+                if (activiveFlag == 0) {
+                    remark = "未激活";
+                } else if (openConcatFlag == 0) {
+                    remark = "未配置客户联系功能";
+                }
+                staff.setOwnerRemark(remark);
+                
+            });
+        }
         return resultResponse(HaoBanErrCode.ERR_1, PageUtil.getPageInfo(page));
     }