修改导购查询bug

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -177,9 +177,10 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             List<Integer> storeInfoIdsBySearch = clerkService.getStoreInfoIdsBySearch(enterpriseId,
                     clerkSearchDTO.getSearch());
             if (CollectionUtils.isEmpty(groupIds) || CollectionUtils.isEmpty(storeInfoIdsBySearch)) {
-                return ServiceResponse.success(new Page<>());
+                storeIdByClerkSearch = "";
+            } else {
+                storeIdByClerkSearch = getStoreIdByStoreInfoIds(storeInfoIdsBySearch, clerkSearchDTO.getSearch());
             }
-            storeIdByClerkSearch = getStoreIdByStoreInfoIds(storeInfoIdsBySearch, clerkSearchDTO.getSearch());
         } else {
             storeIdByClerkSearch = "";
         }
@@ -239,9 +240,10 @@ public class ClerkApiServiceImpl implements ClerkApiService {
             List<Integer> storeInfoIdsBySearch = clerkService.getStoreInfoIdsBySearch(enterpriseId,
                     clerkSearchDTO.getSearch());
             if (CollectionUtils.isEmpty(groupIds) || CollectionUtils.isEmpty(storeInfoIdsBySearch)) {
-                return ServiceResponse.success();
+                storeIdByClerkSearch = "";
+            } else {
+                storeIdByClerkSearch = getStoreIdByStoreInfoIds(storeInfoIdsBySearch, clerkSearchDTO.getSearch());
             }
-            storeIdByClerkSearch = getStoreIdByStoreInfoIds(storeInfoIdsBySearch, clerkSearchDTO.getSearch());
         } else {
             storeIdByClerkSearch = "";
         }
@@ -262,8 +264,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
     private String getStoreIdByStoreInfoIds(List<Integer> storeInfoIdsBySearch, String search) {
         StoreSearchDBDTO storeSearchDBDTO = new StoreSearchDBDTO();
         storeSearchDBDTO.setStoreInfoIdList(storeInfoIdsBySearch);
-        storeSearchDBDTO.setStoreName(search);
-        storeSearchDBDTO.setStoreCode(search);
+        storeSearchDBDTO.setSearch(search);
         List<StoreDTO> dtos = storeService.listStore(storeSearchDBDTO, 1, Integer.MAX_VALUE);
         return Optional.ofNullable(dtos).orElse(Collections.emptyList()).stream().map(e -> e.getStoreId().toString())
                 .reduce((x, y) -> x + " " + y).orElse("");
@@ -277,6 +278,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         storeSearchDTO.setStoreGroupId(clerkSearchDTO.getStoreGroupId());
         storeSearchDTO.setSearchJson(clerkSearchDTO.getSelectJson());
         storeSearchDTO.setStoreIds(clerkSearchDTO.getStoreIds());
+        storeSearchDTO.setSearch(clerkSearchDTO.getSearch());
 
         return storeApiService.listStore(storeSearchDTO, pageNum, pageSize,
                 "storeId,storeName,storeCode,storeInfoId,ownType");

gic-store-web/src/main/resources/dubbo-gic-store-web.xml

@@ -58,4 +58,5 @@
     <dubbo:reference interface="com.gic.wechat.business.api.service.wxa.WeixinWxaFunService" id="weixinWxaFunService" timeout="6000"/>
     <dubbo:reference interface="com.gic.member.api.service.StoreUpdateApiService" id="storeUpdateApiService" timeout="6000"/>
 
+    <dubbo:reference interface="com.gic.enterprise.service.AuditLogApiService" id="auditLogApiService" timeout="6000"/>
 </beans>
\ No newline at end of file