添加样表设备部门过滤

sample-form-manager/db/module.sql

@@ -290,25 +290,25 @@ CREATE TABLE `mortals_xhx_device` (
 -- ----------------------------
 DROP TABLE IF EXISTS `mortals_xhx_device_matter_datum`;
 CREATE TABLE mortals_xhx_device_matter_datum(
-        `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键，自增长',
-        `siteId` bigint(20)      COMMENT '站点ID',
-        `deviceId` bigint(20)      COMMENT '设备id',
-        `deviceCode` varchar(255)      COMMENT '设备编码',
-        `deviceName` varchar(255)      COMMENT '设备名称',
-        `matterId` bigint(20)      COMMENT '事项id',
-        `matterCode` varchar(255)      COMMENT '事项编码',
-        `matterName` varchar(255)      COMMENT '事项名称',
-        `deptId` bigint(20)      COMMENT '部门ID',
-        `deptCode` varchar(256)      COMMENT '部门编号',
-        `deptName` varchar(256)      COMMENT '部门名称',
-        `source` tinyint(2)      COMMENT '事项来源(0.政务网，1.自定义)',
-        `isRecommend` tinyint(2)      COMMENT '是否推荐(0.未推荐，1.推荐)',
-        `sort` int(4)      COMMENT '排序',
-        `createTime` datetime      COMMENT '创建时间',
-        `createUserId` bigint(20)      COMMENT '创建用户',
-        `updateTime` datetime      COMMENT '修改时间',
-        `materiaFullName` varchar(1024)      COMMENT '事项全称',
-        PRIMARY KEY  (`id`)
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键，自增长',
+    `siteId` bigint(20)      COMMENT '站点ID',
+    `deviceId` bigint(20)      COMMENT '设备id',
+    `deviceCode` varchar(255)      COMMENT '设备编码',
+    `deviceName` varchar(255)      COMMENT '设备名称',
+    `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 '部门名称',
+    `source` tinyint(2)      COMMENT '事项来源(0.政务网，1.自定义)',
+    `isRecommend` tinyint(2)      COMMENT '是否推荐(0.未推荐，1.推荐)',
+    `sort` int(4)      COMMENT '排序',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `updateTime` datetime      COMMENT '修改时间',
+    PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备事项申请材料业务';
 
 

sample-form-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceMatterDatumEntity.java

@@ -313,32 +313,32 @@ public class DeviceMatterDatumEntity extends DeviceMatterDatumVo {
 
     public void initAttrValue(){
 
-        this.siteId = null;
+        this.siteId = -1L;
 
         this.deviceId = null;
 
-        this.deviceCode = null;
+        this.deviceCode = "";
 
-        this.deviceName = null;
+        this.deviceName = "";
 
         this.matterId = null;
 
-        this.matterCode = null;
+        this.matterCode = "";
 
-        this.matterName = null;
+        this.matterName = "";
 
         this.deptId = null;
 
-        this.deptCode = null;
+        this.deptCode = "";
 
-        this.deptName = null;
+        this.deptName = "";
 
-        this.source = null;
+        this.source = 0;
 
-        this.isRecommend = null;
+        this.isRecommend = 0;
 
-        this.sort = null;
+        this.sort = 0;
 
-        this.materiaFullName = null;
+        this.materiaFullName = "";
     }
 }
\ No newline at end of file

sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceMatterDatumServiceImpl.java

@@ -68,6 +68,8 @@ public class DeviceMatterDatumServiceImpl extends AbstractCRUDServiceImpl<Device
                 entity.setMatterName(matterEntity.getMatterName());
                 entity.setMateriaFullName(matterEntity.getMatterFullName());
                 entity.setIsRecommend(matterEntity.getIsRecommend());
+                entity.setSource(matterEntity.getSource());
+                entity.setSort(matterEntity.getSort());
                 entity.setDeptId(matterEntity.getDeptId());
                 entity.setDeptCode(matterEntity.getDeptCode());
                 entity.setDeptName(matterEntity.getDeptName());