From 411fe8bba5742c59e43c7f6d5aeb61847977691d Mon Sep 17 00:00:00 2001 From: zyd Date: Thu, 27 Jan 2022 22:58:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8D=95=E5=85=83=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E6=9F=A5=E8=AF=A2=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarModelTree/controller/SarModelTreeController.java | 5 ++++- .../com/adc/da/slrs/sarModelTree/entity/SarModelTree.java | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java index 38227237..0d30200b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/controller/SarModelTreeController.java @@ -8,6 +8,7 @@ import com.adc.da.slrs.sarModelTree.service.ISarModelTreeService; import com.adc.da.slrs.sarModelTree.service.ISarModuleTreeService; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.Head; import com.adc.da.slrs.sarStandProjectLibrary.entity.myResponse.ResponseDto; +import com.adc.da.util.utils.StringUtils; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -64,7 +65,9 @@ public class SarModelTreeController extends BaseController { @GetMapping("/childByList") public ResponseMessage> childByList(SarModelTree parentTree){ // List tsResources = iSarModuleTreeService.recursionGetChildren(parentTree); - + if(StringUtils.isNotBlank(parentTree.getType())){ + parentTree.setModelType(parentTree.getType()); + } List tsResources = iSarModelTreeService.recursionGetChildren(parentTree); return Result.success(tsResources); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java index 1b6b668f..41fcc446 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarModelTree/entity/SarModelTree.java @@ -94,4 +94,11 @@ public class SarModelTree extends BaseEntity { @TableField("MODEL_LEVEL") private int modelLevel; + /** + * 前端数据查询字段 + */ + @TableField(exist=false) + private String type; + + }