From 0aef3b2e15b9822b6fba3fbd4d5dbffec6865312 Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Fri, 11 Sep 2026 17:11:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=96=E6=B6=88=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metadata/area/service/impl/BaseDataAreaServiceImpl.java | 6 ------ .../mapper/eqpbook/BasedataEqpBookChannelMapper.xml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/area/service/impl/BaseDataAreaServiceImpl.java b/inspect-metadata/src/main/java/com/inspect/metadata/area/service/impl/BaseDataAreaServiceImpl.java index 7ca88fd..66aa164 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/area/service/impl/BaseDataAreaServiceImpl.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/area/service/impl/BaseDataAreaServiceImpl.java @@ -30,16 +30,10 @@ public class BaseDataAreaServiceImpl implements IBaseDataAreaService { this.baseDataAreaMapper = baseDataAreaMapper; } - @DataScope( - deptAlias = "d" - ) public List selectAreaList(BaseDataArea area) { return this.baseDataAreaMapper.selectAreaList(area); } - @DataScope( - deptAlias = "d" - ) public List selectAreaRelationList(BaseDataArea area) { return this.baseDataAreaMapper.selectAreaRelationList(area); } diff --git a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookChannelMapper.xml b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookChannelMapper.xml index 765ffd6..a1ee313 100644 --- a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookChannelMapper.xml +++ b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookChannelMapper.xml @@ -89,7 +89,7 @@ bec.patrol_device_code, bec.username, bec.password, - bec.device_source + COALESCE(bec.device_source, be.device_source) AS device_source from basedata_eqpbook_channel bec left join basedata_eqpbook be on bec.eqp_book_id = be.eqp_book_id and bec.channel_code = #{channelCode}