Merge remote-tracking branch 'origin/developer' into developer

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

@@ -79,7 +79,7 @@ public class StoreServiceImpl implements StoreService {
         store.setStoreGroupId(copy.getStoreGroupId());
         store.setStoreInfoId(tabStoreInfo.getStoreInfoId());
         store.setFromEnterpriseId(copy.getFromEnterpriseId());
-        this.tabStoreMapper.insert(store);
+        this.tabStoreMapper.insertSelective(store);
         copy.setStoreId(store.getStoreId());
         copy.setStoreInfoId(store.getStoreInfoId());
         return store.getStoreId();
@@ -436,7 +436,7 @@ public class StoreServiceImpl implements StoreService {
             result = this.tabStoreMapper.updateByPrimaryKeySelective(store);
         }else {
             store.setCreateTime(new Date());
-            result = this.tabStoreMapper.insert(store);
+            result = this.tabStoreMapper.insertSelective(store);
             storeDTO.setStoreId(store.getStoreId());
         }
         return result;

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

@@ -47,7 +47,7 @@ public class ClerkTaskServiceImpl extends AbstractTaskAllocationOperation implem
         InitTaskQO initTaskQo = new InitTaskQO();
         initTaskQo.setEnterpriseId(enterpriseId.toString());// 企业id
         initTaskQo.setOperationUserId(userId);// 操作人id
-        // todo key
+        // key
         initTaskQo.setTaskMqKey(Constants.CLERK_BATCH_IMPORT_MQ_KEY);// 注册的队列名称
         initTaskQo.setTaskType(Constants.CLERK_BATCH_IMPORT_TASK_TYPE);// 任务类型
         initTaskQo.setParams(enterpriseId.toString());// 你自己处理需要的参数

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

@@ -174,6 +174,7 @@ public class StoreRegionApiServiceImpl implements StoreRegionApiService {
     public ServiceResponse<Void> unAuthorizeRegion(Integer toEnterpriseId, Integer storeRegionId) {
         storeRegionRelService.updateStatusByOther(toEnterpriseId, storeRegionId, GlobalInfo.DATA_STATUS_DELETE);
         // TODO 调用删除门店自定义属性的方法
+
         return ServiceResponse.success();
     }
 

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

@@ -326,7 +326,7 @@ public class StoreController extends DownloadUtils {
             report.setDataType(storeExportQO.getDataType());
             report.setDataUrl(request.getHeader("Referer"));
             report.setEnterpriseId(UserDetailUtils.getUserDetail().getEnterpriseId());
-            report.setFileName("门店资料");
+            report.setFileName(storeExportQO.getFileName());
             Integer downloadReport = DataDownloadUtils.createDownloadReport(report);
             String path = RequestContext.getContext().getRequest().getSession().getServletContext().getRealPath("/excel/csv/collaborator/file/");
             List<String> nameList = new ArrayList<>();