update 体系结构树选择

laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java

@@ -40,11 +40,12 @@ public class LawsTreeNodeController extends JeroController<LawsTreeNode, ILawsTr
     @AutoLog(value = "企业标准-体系树")
     @ApiOperation(value = "企业标准-体系树", notes = "企业标准-体系树")
     @GetMapping("/enterprise")
-    public Result<List<LawsTreeNodeModel>> queryENTreeList(@RequestParam(required = false) String nodeName) {
+    public Result<List<LawsTreeNodeModel>> queryENTreeList(@RequestParam(required = false) String nodeName,
+                                                           @RequestParam(required = false) String option) {
         String moduleCode = "EN";
         Result<List<LawsTreeNodeModel>> result = new Result<>();
         try {
-            List<LawsTreeNodeModel> list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName);
+            List<LawsTreeNodeModel> list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option);
             result.setResult(list);
             result.setSuccess(true);
         } catch (Exception e) {
@@ -133,11 +134,12 @@ public class LawsTreeNodeController extends JeroController<LawsTreeNode, ILawsTr
     @AutoLog(value = "国内标准-体系树")
     @ApiOperation(value = "国内标准-体系树", notes = "国内标准-体系树")
     @GetMapping("/domestic")
-    public Result<List<LawsTreeNodeModel>> queryGBTreeList(@RequestParam(required = false) String nodeName) {
+    public Result<List<LawsTreeNodeModel>> queryGBTreeList(@RequestParam(required = false) String nodeName,
+                                                           @RequestParam(required = false) String option) {
         String moduleCode = "GB";
         Result<List<LawsTreeNodeModel>> result = new Result<>();
         try {
-            List<LawsTreeNodeModel> list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName);
+            List<LawsTreeNodeModel> list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option);
             result.setResult(list);
             result.setSuccess(true);
         } catch (Exception e) {
@@ -226,11 +228,12 @@ public class LawsTreeNodeController extends JeroController<LawsTreeNode, ILawsTr
     @AutoLog(value = "海外标准-体系树")
     @ApiOperation(value = "海外标准-体系树", notes = "海外标准-体系树")
     @GetMapping("/overseas")
-    public Result<List<LawsTreeNodeModel>> queryFBTreeList(@RequestParam(required = false) String nodeName) {
+    public Result<List<LawsTreeNodeModel>> queryFBTreeList(@RequestParam(required = false) String nodeName,
+                                                           @RequestParam(required = false) String option) {
         String moduleCode = "FB";
         Result<List<LawsTreeNodeModel>> result = new Result<>();
         try {
-            List<LawsTreeNodeModel> list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName);
+            List<LawsTreeNodeModel> list = lawsTreeNodeService.queryTreeNodeList(moduleCode, nodeName, option);
             result.setResult(list);
             result.setSuccess(true);
         } catch (Exception e) {

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

@@ -19,7 +19,7 @@ public interface ILawsTreeNodeService extends IService<LawsTreeNode> {
 	 *
 	 * @return
 	 */
-    List<LawsTreeNodeModel> queryTreeNodeList(String moduleCode, String nodeName);
+    List<LawsTreeNodeModel> queryTreeNodeList(String moduleCode, String nodeName, String option);
 
 	/**
 	 * 新增

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

@@ -12,6 +12,7 @@ import com.jero.modules.laws.standard.entity.LawsTreeNode;
 import com.jero.modules.laws.standard.mapper.LawsNodeRelationMapper;
 import com.jero.modules.laws.standard.mapper.LawsTreeNodeMapper;
 import com.jero.modules.laws.standard.service.ILawsTreeNodeService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.jero.common.exception.JeroBootException;
@@ -37,7 +38,7 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
     private LawsNodeRelationMapper lawsNodeRelationMapper;
 
     @Override
-    public List<LawsTreeNodeModel> queryTreeNodeList(String moduleCode, String nodeName) {
+    public List<LawsTreeNodeModel> queryTreeNodeList(String moduleCode, String nodeName, String option) {
         LambdaQueryWrapper<LawsTreeNode> query = new LambdaQueryWrapper<>();
         query.eq(LawsTreeNode::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
         query.eq(LawsTreeNode::getModuleCode, moduleCode);
@@ -68,8 +69,12 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl<LawsTreeNodeMapper, Law
         LawsTreeNodeModel myCollect = new LawsTreeNodeModel();
         myCollect.setKey("myCollect");
         myCollect.setValue("myCollect");
+        myCollect.setNodeName("我的收藏");
         myCollect.setTitle("我的收藏");
-        lawsTreeNodeModels.add(myCollect);
+        // 不为空是选择框，为空是左侧树
+        if (StringUtils.isBlank(option)) {
+            lawsTreeNodeModels.add(myCollect);
+        }
         return lawsTreeNodeModels;
     }
 

laws-modules/src/main/java/com/jero/modules/tag/enums/LawsFieldTypeEnum.java

@@ -18,7 +18,8 @@ public enum LawsFieldTypeEnum {
     TEXT_BOX("文本框","9"),
     OPTION_SINGLE("下拉单选","10"),
     OPTION_MANY("下拉多选","11"),
-    TREE_BOX("树型结构","12");
+    TREE_BOX("树型结构","12"),
+    OPTION_Link("输入框（链接）","13");
 
     String name;
     String value;