Merge remote-tracking branch 'origin/master'

laws-modules/src/main/java/com/jero/modules/laws/common/controller/LawsCommonController.java

@@ -1,5 +1,6 @@
 package com.jero.modules.laws.common.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
@@ -7,6 +8,8 @@ import com.jero.modules.laws.common.service.ILawsCommonService;
 import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
 import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
 import com.jero.modules.laws.standard.entity.LawsNodeRelation;
+import com.jero.modules.laws.standard.entity.LawsUpdateRecord;
+import com.jero.modules.laws.standard.service.ILawsUpdateRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * @Author: liao
@@ -29,6 +33,8 @@ public class LawsCommonController {
 
     @Autowired
     private ILawsCommonService lawsCommonService;
+    @Autowired
+    private ILawsUpdateRecordService lawsUpdateRecordService;
 
     @ApiOperation(value="多选标准弹框", notes="多选标准弹框")
     @GetMapping(value = "/getManyStandardSelectionBox")
@@ -38,4 +44,14 @@ public class LawsCommonController {
         return Result.OK(lawsCommonService.getManyStandardSelectionBox(selectionBoxVO, pageNo, pageSize));
     }
 
+    @AutoLog(value = "法规更新记录列表查询")
+    @ApiOperation(value="法规更新记录列表查询", notes="法规更新记录列表查询")
+    @GetMapping(value = "/getUpdateRecordList")
+    public Result<List<LawsUpdateRecord>> getUpdateRecordList(@RequestParam("standardNumber") String standardNumber) {
+        LambdaQueryWrapper<LawsUpdateRecord> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(LawsUpdateRecord::getUniqueRelationFlag, standardNumber);
+        queryWrapper.orderByDesc(LawsUpdateRecord::getCreateTime);
+        return Result.OK(lawsUpdateRecordService.list(queryWrapper));
+    }
+
 }

laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java

@@ -63,9 +63,15 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
         } else {
             lawsTreeNodes = new ArrayList<>(nodesSet);
         }
-
         // 调用wrapTreeDataToTreeList方法生成树状数据
-        return FindsTreeNodeChildrenUtil.wrapTreeDataToTreeList(lawsTreeNodes);
+        List<LawsTreeNodeModel> lawsTreeNodeModels = FindsTreeNodeChildrenUtil.wrapTreeDataToTreeList(lawsTreeNodes);
+        // 添加我的收藏节点
+        LawsTreeNodeModel myCollect = new LawsTreeNodeModel();
+        myCollect.setKey("myCollect");
+        myCollect.setValue("myCollect");
+        myCollect.setTitle("我的收藏");
+        lawsTreeNodeModels.add(myCollect);
+        return lawsTreeNodeModels;
     }
 
     private Set<LawsTreeNode> findPathToRoot(List<LawsTreeNode> allNodes, LawsTreeNode node) {