From 5887b59de46abe9c912c2306d5e4cfd074cb9d99 Mon Sep 17 00:00:00 2001 From: xiachao Date: Wed, 7 Aug 2024 13:15:39 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/thing/eq/eqmanager/dto/EqDTO.java | 2 +- .../eq/eqmanager/service/impl/IotThingsServiceImpl.java | 8 ++++---- .../resources/mapper/eqmanager/IotThingBaseInfoMapper.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/equipment/src/main/java/com/thing/eq/eqmanager/dto/EqDTO.java b/modules/equipment/src/main/java/com/thing/eq/eqmanager/dto/EqDTO.java index f7d0261..e5f5e07 100644 --- a/modules/equipment/src/main/java/com/thing/eq/eqmanager/dto/EqDTO.java +++ b/modules/equipment/src/main/java/com/thing/eq/eqmanager/dto/EqDTO.java @@ -33,7 +33,7 @@ public class EqDTO implements Serializable { @Schema(description = "设备类型(equipment表示设备，equipment_part表示部件)") private String type; @Schema(description = "企业id") - private String deptId; + private String deptIds; @Schema(description = "租户code") private Long tenantCode; private Long creator; diff --git a/modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java b/modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java index 1ee01ab..8aceb51 100644 --- a/modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java +++ b/modules/equipment/src/main/java/com/thing/eq/eqmanager/service/impl/IotThingsServiceImpl.java @@ -129,10 +129,10 @@ public class IotThingsServiceImpl implements IotThingsService { tenantEntity.setTemplateMark("0"); //获取deptId以及tenantCode SysDeptEntity sysDeptEntity; - if (dto.getDeptId()==null){ + if (dto.getDeptIds()==null){ sysDeptEntity = sysDeptService.getDeptVaildPermission((Long) null); }else { - sysDeptEntity = sysDeptService.getDeptVaildPermission(dto.getDeptId()); + sysDeptEntity = sysDeptService.getDeptVaildPermission(dto.getDeptIds()); } tenantEntity.setTenantCode(sysDeptEntity.getTenantCode()); @@ -399,7 +399,7 @@ public class IotThingsServiceImpl implements IotThingsService { info.setName(eq.getName()); info.setType(eq.getType()); info.setTenantCode(eq.getTenantCode()); - info.setDeptId(eq.getDeptIds()); + info.setDeptIds(eq.getDeptIds()); info.setCreator(eq.getCreator()); info.setCreateDate(eq.getCreateDate()); info.setUpdater(eq.getUpdater()); @@ -634,7 +634,7 @@ public class IotThingsServiceImpl implements IotThingsService { info.setName(eq.getName()); info.setType(eq.getType()); info.setTenantCode(eq.getTenantCode()); - info.setDeptId(eq.getDeptIds()); + info.setDeptIds(eq.getDeptIds()); info.setCreator(eq.getCreator()); info.setCreateDate(eq.getCreateDate()); info.setUpdater(eq.getUpdater()); diff --git a/modules/equipment/src/main/resources/mapper/eqmanager/IotThingBaseInfoMapper.xml b/modules/equipment/src/main/resources/mapper/eqmanager/IotThingBaseInfoMapper.xml index 1e730b3..f240d78 100644 --- a/modules/equipment/src/main/resources/mapper/eqmanager/IotThingBaseInfoMapper.xml +++ b/modules/equipment/src/main/resources/mapper/eqmanager/IotThingBaseInfoMapper.xml @@ -54,7 +54,7 @@ things.code, things."name", things."type", - things.dept_id, + things.dept_ids, things.tenant_code, things.creator, things.create_date,