Merge remote-tracking branch 'origin/master'

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;

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());

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,