企微托管

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

@@ -86,7 +86,7 @@ public class MemberController {
                 searchJson = JSON.parseObject(searchParams);
             }
             if(qywxFlag==1) {
-               // searchJson = NewNodeAddUtil.addNewNodeForAnd("qywxFlag", OperateEnum.OPERATE_EQ.getValue(), 0, searchJson);
+                searchJson = NewNodeAddUtil.addNewNodeForAnd("qywxFlag", OperateEnum.OPERATE_EQ.getValue(), 0, searchJson);
             }
             DynamicSearchDTO search = new DynamicSearchDTO();
             searchJson = this.storeService.parseSelectData(searchJson, enterpriseId, clerkId, new Date());

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

@@ -732,8 +732,13 @@ public class QywxOpenTaskController {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         String enterpriseId = loginUser.getEnterpriseId();
-        // 添加的人数
-        int memberNum = this.getMemberNum(dto.getSearchParams(), dto.getMemberType());
+        // 添加的人数 1和专属无好友 2和所有无好友
+        int memberRule= dto.getMemberRule() ;
+        int qywxFlag = 0 ;
+        if(memberRule==2) {
+            qywxFlag = 1 ;
+        }
+        int memberNum = this.getMemberNum(dto.getSearchParams(), dto.getMemberType(),qywxFlag);
         // 成员数
         int staffNum = this.openStaffApiService.listAllOnlineStaff(wxEnterpriseId, enterpriseId).size();
         if (staffNum == 0) {
@@ -753,8 +758,8 @@ public class QywxOpenTaskController {
         return RestResponse.successResult(days);
     }
 
-    private int getMemberNum(String searchParams, int memberType) {
-        RestResponse<Object> resp = this.memberController.getMemberCount(searchParams, memberType,1);
+    private int getMemberNum(String searchParams, int memberType , int qywxFlag) {
+        RestResponse<Object> resp = this.memberController.getMemberCount(searchParams, memberType,qywxFlag);
         return Integer.valueOf(resp.getResult().toString());
     }