Skip to content

H
haoban-manage3.0
Commit 9fc953a7 by qwmqiuwenmin
Options

Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

parents 16c73bd9 0eda2bed
Showing with 3 additions and 0 deletions
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java
...@@ -128,6 +128,9 @@ public class WxEnterpriseController extends WebBaseController{ ...@@ -128,6 +128,9 @@ public class WxEnterpriseController extends WebBaseController{
} }
List<StoreDTO> t_list = storePage.getResult(); List<StoreDTO> t_list = storePage.getResult();
List<String> storeIds = t_list.stream().map(s->s.getStoreId()).collect(Collectors.toList()); List<String> storeIds = t_list.stream().map(s->s.getStoreId()).collect(Collectors.toList());
if(StringUtils.isEmpty(keyWord)){
storeIds = null;
}
Page<DepartmentDTO> page = departmentApiService.pageFullStoreByWxEnterpriseId(wxEnterpriseId, keyWord,storeIds,maxVersionCount, basePageInfo); Page<DepartmentDTO> page = departmentApiService.pageFullStoreByWxEnterpriseId(wxEnterpriseId, keyWord,storeIds,maxVersionCount, basePageInfo);
List<DepartmentDTO> list = page.getResult(); List<DepartmentDTO> list = page.getResult();
List<StoreVo> resultList = EntityUtil.changeEntityListByJSON(StoreVo.class,list); List<StoreVo> resultList = EntityUtil.changeEntityListByJSON(StoreVo.class,list);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment