Merge branch 'developer' into 'master'

Developer

See merge request !70

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

@@ -181,7 +181,7 @@ public class InfoController extends WebBaseController{
         }
 
         WxEnterpriseDTO enterpriseDTO = wxEnterpriseApiService.getOne(enterpriseDetailDTO.getWxEnterpriseId());
-        if (enterpriseDetailDTO == null) {
+        if (enterpriseDTO == null) {
             logger.info("改企业不存在:{}", qo.getGicEnterpriseId());
             return resultResponse(HaoBanErrCode.ERR_400002);
         }
@@ -222,7 +222,13 @@ public class InfoController extends WebBaseController{
 //        List<DepartmentDTO> result = response.getResult();
         List<StoreMemberVO> retList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(result)) {
-            result.stream().forEach(dto -> {
+            result.stream().filter(staffClerkInfoDTO -> {
+                if (staffClerkInfoDTO.getEnterpriseId().equals(qo.getGicEnterpriseId())) {
+                    return true;
+                }else{
+                    return false;
+                }
+            }).forEach(dto -> {
                 StoreMemberVO VO = new StoreMemberVO();
                 StoreDTO store = storeService.getStore(dto.getStoreId());
                 ClerkDTO clerkDTO = clerkService.getClerkByClerkId(dto.getClerkId());