用户操作记录再调整

src/main/java/com/zhiwei/brandkbs2/aop/AopLogRecord.java

@@ -146,10 +146,19 @@ public class AopLogRecord {
                 if (v.contains(":")){
                     String[] fatherSplit = v.split(":", 2);
                     JSONObject object = jsonObject.getJSONObject(fatherSplit[0]);
-                    if (Objects.nonNull(object)){
-                        Object o = object.get(fatherSplit[1]);
+                    if (Objects.nonNull(object)) {
+                        String[] sonSplit = fatherSplit[1].split(",");
+                        List<Object> sonList = new ArrayList<>(sonSplit.length);
+                        for (String s : sonSplit) {
+                            Object o = object.get(s);
                             if (Objects.nonNull(o) && StringUtils.isNotBlank(o.toString())) {
-                            res.add(o);
+                                sonList.add(o);
+                            }
+                        }
+                        if (1 == sonList.size()) {
+                            res.add(sonList.get(0));
+                        } else{
+                            res.add("{" + Tools.concatWithMinus(sonList) + "}");
                         }
                     }
                 }

src/main/java/com/zhiwei/brandkbs2/controller/app/AppSearchController.java

@@ -135,7 +135,7 @@ public class AppSearchController extends BaseController {
     }
 
     @ApiOperation("搜索-全网搜")
-    @LogRecord(values = {"fans", "sensitiveChannels:father", "keyword", "search"}, description = "全网搜", arguments = true, entity = true)
+    @LogRecord(values = {"fans", "sensitiveChannels:father,son", "keyword", "search"}, description = "全网搜", arguments = true, entity = true)
     @PostMapping("/searchWhole")
     public ResponseResult searchWholeNetwork(@RequestBody SearchFilterDTO dto) {
         // 针对商业数据库做限制