Merge branch 'feature/xgh/2406企微托管' into 'master'

企微托管

See merge request !2055

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

@@ -8,6 +8,8 @@ import com.gic.api.base.commons.JSONResponse;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.clerk.api.dto.AuthorizedUser;
+import com.gic.clerk.api.dto.ClerkDTO;
+import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
@@ -67,6 +69,8 @@ public class QywxOpenController {
     private OpenStaffExcelHandler openStaffExcelHandler;
     @Autowired
     private EnterpriseUseForbidService enterpriseUseForbidService;
+    @Autowired
+    private ClerkService clerkService ;
 
     /**
      * 托管列表
@@ -182,6 +186,11 @@ public class QywxOpenController {
         if (CollectionUtils.isEmpty(relationList)) {
             return RestResponse.failure("9999", "成员未关联导购");
         }
+        relationList.forEach(o->{
+            String clerkId = o.getClerkId() ;
+            ClerkDTO clerk = this.clerkService.getclerkById(clerkId) ;
+            o.setClerkType(clerk.getClerkType());
+        });
         relationList = relationList.stream().filter(o -> o.getClerkType() <= 1 && o.getEnterpriseId().equals(enterpriseId)).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(relationList)) {
             return RestResponse.failure("9999", "成员需关联gic商户下导购");