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

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

@@ -364,7 +364,7 @@ public class ClerkImportController {
             }
         }
         GicDictDTO dict = this.dictApiService.getDictByCode(Constants.NATION_CODE_DICT, nationcode).getResult();
-        if (dict != null) {
+        if (dict == null) {
             bean.setErrorMessage("区号错误");
             validate = false;
         }

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

@@ -309,8 +309,8 @@ public class StoreController extends DownloadUtils {
             report.setApplyUserId(UserDetailUtils.getUserDetail().getUserId());
             report.setDataContent("门店资料");
             report.setDataCount(total);
-            report.setDataType(2);
-            report.setDataUrl("/damo-store/shop-management/shop-list");
+            report.setDataType(storeExportQO.getDataType());
+            report.setDataUrl((String) RequestContext.getContext().getRequest().getAttribute("moduleMenuUrl"));
             report.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
             report.setFileName("门店资料");
             Integer downloadReport = DataDownloadUtils.createDownloadReport(report);