Merge branch 'fix_03_15' into developer

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

@@ -111,7 +111,11 @@ public class EnterpriseController extends WebBaseController {
             wxEnterpriseIdInList = listWxEnterpriseIdByEnterpriseName(gicEnterpriseName);
             // 有条件并且查询为空返回
             if (CollectionUtil.isEmpty(wxEnterpriseIdInList)) {
-                return resultResponse(HaoBanErrCode.ERR_1, new PageResult<>());
+                PageResult<Object> objectPageResult = new PageResult<>();
+                objectPageResult.setPageNum(pageInfo.getPageNum());
+                objectPageResult.setPageNum(pageInfo.getPageSize());
+                objectPageResult.setList(Collections.emptyList());
+                return resultResponse(HaoBanErrCode.ERR_1, objectPageResult);
             }
         }
 
@@ -196,6 +200,9 @@ public class EnterpriseController extends WebBaseController {
                                              String loginUserId) {
         // 查询所有状态
         Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo, keyword, wxEnterpriseIdInList, gicContactHelper, version, null, loginUserId);
+        if (CollectionUtil.isEmpty(page.getResult())) {
+            return page;
+        }
         page.getResult().forEach(one -> {
             one.setVersion("3.0");
             one.setBuyDate(new Date());
@@ -226,6 +233,9 @@ public class EnterpriseController extends WebBaseController {
         }
         List<String> queryList = new ArrayList<>(wxEnterpriseIdSetInCache);
         Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo, keyword, queryList, gicContactHelper, version, null, loginUserId);
+        if (CollectionUtil.isEmpty(page.getResult())) {
+            return page;
+        }
         page.getResult().forEach(one -> {
             one.setVersion("3.0");
             one.setBuyDate(new Date());
@@ -247,6 +257,9 @@ public class EnterpriseController extends WebBaseController {
                                                String loginUserId) {
         // 查询关闭状态
         Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo, keyword, wxEnterpriseIdInList, gicContactHelper, version, new ArrayList<>(wxEnterpriseIdSetInCache), loginUserId);
+        if (CollectionUtil.isEmpty(page.getResult())) {
+            return page;
+        }
         page.getResult().forEach(one -> {
             one.setVersion("3.0");
             one.setBuyDate(new Date());