2 Revize 0721b6fd99 ... c828e2f9e7

Autor SHA1 Zpráva Datum
  zhouhaijun c828e2f9e7 Merge remote-tracking branch 'origin/feature/hunan-fix-0407' into feature/hunan-fix-0407 před 1 týdnem
  zhouhaijun 9d7bd61433 修改—— před 1 týdnem

+ 2 - 2
src/main/java/com/bootdo/datas/controller/DataEntryController.java

@@ -59,7 +59,7 @@ public class DataEntryController {
      */
     @PostMapping("/remove")
     @ResponseBody
-    @RequiresPermissions("datas:data:remove")
+    @RequiresPermissions("datas:dataEntry:remove")
     public R remove(Long id) {
         //判断一下该条数据是否被风评系统使用
         int cnt = gyDataService.countAaAssData(id);
@@ -73,7 +73,7 @@ public class DataEntryController {
 
 
     @GetMapping("/edit/{id}")
-    @RequiresPermissions("datas:data:edit")
+    @RequiresPermissions("datas:dataEntry:edit")
     String edit(@PathVariable("id") Long id, Model model) {
         log.info("edit id:{}", id);
         GyDataImportDTO data = gyDataService.get(id);

+ 0 - 3
src/main/java/com/bootdo/datas/service/impl/GyDataServiceImpl.java

@@ -811,9 +811,6 @@ public class GyDataServiceImpl implements GyDataService {
             map.put("unitId", gyUnitId);
             if (!ObjectUtils.isEmpty(city)) {
                 map.put("unitCity", city);
-                map.put("auditStage", "1");
-            } else {
-                map.put("auditStage", "2");
             }
 
         }

+ 2 - 2
src/main/java/com/bootdo/system/config/AuthorizationInterceptor.java

@@ -42,14 +42,14 @@ public class AuthorizationInterceptor implements HandlerInterceptor {
                 }
                 String cacheToken =  tokenUtil.getLoginUser(username);
                 if(ObjectUtils.isEmpty(cacheToken)) {
-                    logger.error("preHandle =====================cacheToken is null=======================A");
+                    //logger.error("preHandle =====================cacheToken is null=======================A");
                     return true;
                 }
                 String tokenStr = cacheToken.split("_")[0];
 
                 Token token = tokenUtil.getToken(tokenStr);
                 if (ObjectUtils.isEmpty(token)) {
-                    logger.error("preHandle =====================token is null=======================B");
+                    //logger.error("preHandle =====================token is null=======================B");
                     return true;
                 }