水木bug修复

modules/thing/src/main/java/com/thing/screen/dto/IotEnterpriseDashboardDTO.java

@@ -38,11 +38,11 @@ public class IotEnterpriseDashboardDTO implements Serializable {
     @Schema(description = "创建者")
     private Long creator;
     @Schema(description = "创建时间")
-    private Date createDate;
+    private Long createDate;
     @Schema(description = "更新者")
     private Long updater;
     @Schema(description = "更新时间")
-    private Date updateDate;
+    private Long updateDate;
     @Schema(description = "大屏名称")
     private String largeScreenName;
     @Schema(description = "背景图片地址")

modules/thing/src/main/java/com/thing/screen/service/impl/IotEnterpriseDashboardServiceImpl.java

@@ -137,7 +137,7 @@ public class IotEnterpriseDashboardServiceImpl extends BaseServiceImpl<IotEnterp
     public List<IotDashboardGroupDTO> dashboardList(String tenantCode) {
 
         QueryWrapper wrapper = new QueryWrapper();
-        wrapper.eq("tenant_code", tenantCode, ObjectUtil.isNotEmpty(tenantCode));
+        wrapper.eq("tenant_code", Long.valueOf(tenantCode), ObjectUtil.isNotEmpty(tenantCode));
 
         return ConvertUtils.sourceToTarget(iotDashboardGroupDao.selectListByQuery(wrapper),IotDashboardGroupDTO.class);
     }

modules/visual-design/src/main/java/com/thing/visual/component/service/impl/IotVisualComponentServiceImpl.java

@@ -129,10 +129,12 @@ public class IotVisualComponentServiceImpl extends BaseServiceImpl<IotVisualComp
 
         dtoPageData.getList().forEach(temp->{
             IotVisualGroupEntity group =  iotVisualGroupService.getById(temp.getGroupId());
-            temp.setGroupName(group.getName());
-            temp.setGroupBusinessName(group.getBusinessName());
-            temp.setGroupSort(group.getSort());
-            temp.setGroupBSort(group.getBsSort());
+            if(ObjectUtils.isNotEmpty(group)){
+                temp.setGroupName(group.getName());
+                temp.setGroupBusinessName(group.getBusinessName());
+                temp.setGroupSort(group.getSort());
+                temp.setGroupBSort(group.getBsSort());
+            }
         });
         return dtoPageData;
     }