Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

gic-store-service/src/main/java/com/gic/store/service/impl/ClerkServiceImpl.java

@@ -9,6 +9,7 @@ import com.gic.store.entity.TabClerk;
 import com.gic.store.service.ClerkService;
 import com.gic.store.service.StoreService;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.dubbo.common.utils.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -101,8 +102,11 @@ public class ClerkServiceImpl implements ClerkService {
     @Override
     public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, List<Integer> storeInfoIdList, String search) {
         // list 如果太大， 让 mybatis 解析 会打满内存
-        String storeInfoIds = storeInfoIdList.stream().map(Object::toString).collect(Collectors.joining(","));
-        return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, "(" + storeInfoIds + ")", search, null, 1);
+        String storeInfoIds = null;
+        if (CollectionUtils.isNotEmpty(storeInfoIdList)) {
+            storeInfoIds = "(" + storeInfoIdList.stream().map(Object::toString).collect(Collectors.joining(",")) + ")";
+        }
+        return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, storeInfoIds, search, null, 1);
     }
 
     @Override
@@ -112,8 +116,12 @@ public class ClerkServiceImpl implements ClerkService {
 
     @Override
     public List<TabClerk> listClerkByStoreInfoId(Integer enterpriseId, List<Integer> storeInfoIdList, String search, Integer clerkType) {
-        String storeInfoIds = storeInfoIdList.stream().map(Object::toString).collect(Collectors.joining(","));
-        return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, "(" + storeInfoIds + ")", search, clerkType, null);
+        // list 如果太大， 让 mybatis 解析 会打满内存
+        String storeInfoIds = null;
+        if (CollectionUtils.isNotEmpty(storeInfoIdList)) {
+            storeInfoIds = "(" + storeInfoIdList.stream().map(Object::toString).collect(Collectors.joining(",")) + ")";
+        }
+        return tabClerkMapper.listClerkByStoreInfoId(enterpriseId, null, storeInfoIds, search, clerkType, null);
     }
 
     @Override

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

@@ -848,6 +848,9 @@ public class StoreApiServiceImpl implements StoreApiService {
                 JSONObject data = list.getJSONObject(j);
                 String key = data.getJSONObject("data").getString("key");
                 logger.info("11111:{}", key);
+                //前端调整，把数据改为逗号隔开了
+                data.getJSONObject("data").put("value", data.getJSONObject("data").getString("value").replaceAll(",", " "));
+
                 if(StoreESFieldsEnum.STORETAG.getField().equals(key)){
                     JSONObject json = new JSONObject();
                     json.put("type", OperateEnum.OPERATE_OR.getValue());

gic-store-web/src/main/java/com/gic/store/web/controller/StoreController.java

@@ -177,7 +177,8 @@ public class StoreController extends DownloadUtils {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
         storeSearchDTO.setEnterpriseId(enterpriseId);
-        storeSearchDTO.setStoreResource(UserDetailUtils.getUserDetail().getStoreResourceId());
+
+        setStoreWidgetId(storeSearchDTO);
 
         //门店标签
         ServiceResponse<StoreTagDTO> storeTagResult = storeTagApiService.getByStoreTagId(storeSearchDTO.getStoreTagId());
@@ -468,6 +469,8 @@ public class StoreController extends DownloadUtils {
 
     @RequestMapping("export-store-list")
     public RestResponse exportStoreList(HttpServletRequest request, @RequestBody StoreExportQO storeExportQO){
+        setStoreWidgetId(storeExportQO);
+
         storeExportQO.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
         ServiceResponse<Long> response = this.storeApiService.queryStoreCountFromEs(storeExportQO);
         if(response.isSuccess() && response.getResult() > 0){
@@ -550,6 +553,8 @@ public class StoreController extends DownloadUtils {
 
     @RequestMapping("store-qrcode-download")
     public RestResponse storeQrcodeDownload(@RequestBody QrcodeQO qrcodeQO){
+        setStoreWidgetId(qrcodeQO.getStoreSearchDTO());
+
         int total = 0;
         if(qrcodeQO.getIsAll() == 1){
             StoreSearchDTO storeSearchDTO = qrcodeQO.getStoreSearchDTO();
@@ -955,5 +960,18 @@ public class StoreController extends DownloadUtils {
         return clerkDTO;
     }
 
+    private void setStoreWidgetId(StoreSearchDTO storeSearchDTO) {
+        List<Integer> storeResourceList = new ArrayList<>();
+        if (UserDetailUtils.getUserDetail().getStoreResourceId() != null) {
+            storeResourceList.add(UserDetailUtils.getUserDetail().getStoreResourceId().intValue());
+        }
+        if (storeSearchDTO.getStoreResource() != null) {
+            storeResourceList.add(storeSearchDTO.getStoreResource().intValue());
+        }
+        if (CollectionUtils.isNotEmpty(storeResourceList)) {
+            storeSearchDTO.setStoreResourceList(storeResourceList);
+        }
+    }
+
 
 }
\ No newline at end of file

gic-store-web/src/main/java/com/gic/store/web/controller/StoreImportController.java

@@ -258,6 +258,7 @@ public class StoreImportController {
      * @throws IOException
      */
     @RequestMapping("/export-error-data")
+    @HeaderSignIgnore
     public RestResponse exportErrorData(HttpServletRequest request, HttpServletResponse response) throws IOException {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         String fileName = "门店导入错误记录.xlsx";