Merge branch 'master' of http://43.137.18.189:13000/wuhan/wxjy-hg

wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/system/controller/BusLogController.java

@@ -119,7 +119,7 @@ public class BusLogController extends BaseController {
      */
     @GetMapping(value = "/query-log")
     public void queryLog(@RequestParam String modelName) throws UnsupportedEncodingException {
-        SysBusLogUtil.log(modelName, true,null, SysBusLogUtil.ACT_TYPE_RETRIEVE);
+        SysBusLogUtil.log(modelName, true,null, SysBusLogUtil.ACT_TYPE_QUERY);
     }
 
 

wxjy-wxjy-service/src/main/java/cn/gov/customs/wxjy/utils/SysBusLogUtil.java

@@ -137,13 +137,9 @@ public class SysBusLogUtil {
             content = "导出-"+subject;
         }else if(SysBusLogUtil.ACT_TYPE_IMPORT.equals(actType)){// 导入
             content = "导入-"+subject;
-        }else{
-            //自定义日志标题/
-            content = actType;
-            actType = SysBusLogUtil.ACT_TYPE_UPDATE;
         }
-        if(SysBusLogUtil.ACT_TYPE_RETRIEVE.equals(actType)){
-            SysBusLogUtil.addQueryLog(subject,content,actType,flag);
+        if(SysBusLogUtil.ACT_TYPE_QUERY.equals(actType)){
+            SysBusLogUtil.addQueryLog(subject,"访问-"+subject,actType,flag);
         } else {
             // 添加操作日志
             SysBusLogUtil.addBusLog(subject, content, actType, flag);

wxjy-wxjy-web/src/router/app-router.ts

@@ -139,7 +139,7 @@ const routers: Array<RouteRecordRaw> = [
     name: 'BusQueryLog',
     component: () => import('@/views/system/BusQueryLog.vue'),
     meta: {
-      title: '危化品目录',
+      title: '查询日志',
       permissions:"BUS_QUERY_LOG_VIEW_BT"
     }
   },