添加皮肤相关

fill-manager/db/module.sql

@@ -290,6 +290,7 @@ CREATE TABLE mortals_xhx_device_matter_datum(
     `matterId` bigint(20)      COMMENT '事项id',
     `matterCode` varchar(255)      COMMENT '事项编码',
     `matterName` varchar(255)      COMMENT '事项名称',
+    `materiaFullName` varchar(1024)      COMMENT '事项全称',
     `deptId` bigint(20)      COMMENT '部门ID',
     `deptCode` varchar(256)      COMMENT '部门编号',
     `deptName` varchar(256)      COMMENT '部门名称',
@@ -299,7 +300,6 @@ CREATE TABLE mortals_xhx_device_matter_datum(
     `createTime` datetime      COMMENT '创建时间',
     `createUserId` bigint(20)      COMMENT '创建用户',
     `updateTime` datetime      COMMENT '修改时间',
-    `materiaFullName` varchar(1024)      COMMENT '事项全称',
     PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备事项申请材料业务';
 

fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java

@@ -161,6 +161,7 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
                 DeviceMatterDatumQuery deviceMatterDatumQuery = new DeviceMatterDatumQuery().deviceCode(query.getDeviceCode());
                 List<Long> matterIdList = deviceMatterDatumService.find(deviceMatterDatumQuery, pageInfo, context).getList().stream().map(item -> item.getMatterId()).collect(Collectors.toList());
 
+                if (!ObjectUtils.isEmpty(matterIdList)) {
                     MatterDatumQuery matterDatumQuery = new MatterDatumQuery();
                     matterDatumQuery.setMatterIdList(matterIdList);
 
@@ -172,7 +173,7 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
                         BeanUtils.copyProperties(item, matterDatumInfo, BeanUtil.getNullPropertyNames(item));
                         return matterDatumInfo;
                     }).collect(Collectors.toList());
-
+                }
 /*                Set<Long> matterSet = deviceMatterDatumService.find(deviceMatterDatumQuery).stream().map(item -> item.getMatterId()).collect(Collectors.toSet());
                 Iterator<MatterDatumInfo> iterator = collect.iterator();
                 while (iterator.hasNext()) {