合并分支 'master' 到 'dev_third_stage'

Master 查看合并请求 laws-nio/laws-weilai!9
2022-06-18 16:28:56 +08:00
parent 6537cf0b29 1273543be1
commit b67fa29016
19 changed files with 669 additions and 46 deletions
@@ -10,7 +10,7 @@ Target Server Type    : MYSQL
 Target Server Version : 50733
 File Encoding         : 65001

-Date: 2022-06-17 17:16:49
+Date: 2022-06-18 16:09:03
 */

 SET FOREIGN_KEY_CHECKS=0;
@@ -343,7 +343,7 @@ CREATE TABLE `home_document_dynamic` (
  `update_time` datetime DEFAULT NULL COMMENT '更新日期',
  `sys_org_code` varchar(64) DEFAULT NULL COMMENT '所属部门',
  `msg_content` varchar(1000) DEFAULT NULL COMMENT '消息内容',
-  `msg_content_info` varchar(1000) DEFAULT NULL COMMENT '消息详情',
+  `msg_content_info` varchar(4000) DEFAULT NULL COMMENT '消息详情',
  PRIMARY KEY (`id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;

@@ -1347,7 +1347,7 @@ INSERT INTO `onl_cgform_field` VALUES ('14990381dc845a9198a4128ed1b59218', '4028
 INSERT INTO `onl_cgform_field` VALUES ('14ab86b4d9de68bc3eb01af6b07eaf51', 'adf3934df41447aba921e5466f23dfff', 'attestation_rank', 'aaaa', '认证级别', '20', null, '0', '1', 'string', '100', '0', '', '', '', '', 'text', '', '120', null, '0', '', '', '0', '1', '1', '0', 'single', '', '', 'admin', '2022-04-11 15:39:04', '2022-04-08 17:18:31', 'admin', '', '', '', '', '', 'text', '0', null, null, '0', null, null, null, null, null, null);
 INSERT INTO `onl_cgform_field` VALUES ('14c7e5062e0fb7f5db5138acc6bede28', '402813817eebc6c9017eebc6d4bc0004', 'id_type', null, '主键类型', '11', 'id_type', '0', '1', 'string', '100', '0', null, null, null, null, 'text', null, '120', null, '0', null, null, '0', '1', '1', '0', 'single', null, null, null, null, '2022-02-12 10:33:04', 'admin', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', null, null);
 INSERT INTO `onl_cgform_field` VALUES ('1501848401568935937', '48308196e7b04761b533dc31bc899707', 'title_en', 'English Title', '英文标题', '4', null, '0', '1', 'String', '200', '0', null, null, null, null, '1', null, null, null, '1', null, null, '1', '1', '1', '1', null, null, null, 'admin', '2022-06-06 16:05:28', null, null, null, null, null, null, null, null, null, null, null, null, '1499657602378825729', '1', '1', '0', '1', null);
-INSERT INTO `onl_cgform_field` VALUES ('1506541101228556290', '48308196e7b04761b533dc31bc899707', 'xin1_che1_xing2_shi2_shi1_ri4_qi1', 'New Type Execution Date', '新车型实施日期', '11', null, '0', '1', 'Date', '50', '0', null, '', null, null, '5', null, null, null, '1', null, null, '1', '1', '0', '1', null, null, null, 'admin', '2022-06-06 16:05:28', null, null, null, null, null, null, null, null, null, null, null, null, '1499657602378825729', '1', '1', '0', '1', '1493782653286047745');
+INSERT INTO `onl_cgform_field` VALUES ('1506541101228556290', '48308196e7b04761b533dc31bc899707', 'xin1_che1_xing2_shi2_shi1_ri4_qi1', 'New Type Execution Date', '新车型实施日期', '11', null, '0', '1', 'Date', '50', '0', null, '', null, null, '5', null, null, null, '0', null, null, '1', '1', '0', '1', null, null, null, 'admin', '2022-06-06 16:05:28', null, null, null, null, null, null, null, null, null, null, null, null, '1499657602378825729', '1', '1', '0', '1', '1493782653286047745');
 INSERT INTO `onl_cgform_field` VALUES ('1529373706885799937', 'c998a34ea4b84089932197ed0705c757', 'zhan3_shi4_shun4_xu4', 'sortNumber', '展示顺序', '11', null, '0', '1', 'Double', '100', '0', null, null, null, null, '2', null, null, null, '1', null, null, '0', '1', '1', '1', null, null, null, 'ning.chen', '2022-05-25 16:08:01', '2022-05-25 16:08:01', 'ning.chen', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', '0', null);
 INSERT INTO `onl_cgform_field` VALUES ('157f9119129a2126fd15dc127b9f6f6c', 'a234bb12c0174f9d9d451ae138169b6a', 'content_json', 'aaaa', '内容', '9', null, '0', '1', 'Text', '0', '0', '', '', '', '', 'text', '', '120', null, '0', '', '', '0', '1', '1', '0', 'single', '', '', null, null, '2022-04-11 17:32:20', 'admin', '', '', '', '', '', 'text', '0', null, null, '0', null, null, null, null, null, null);
 INSERT INTO `onl_cgform_field` VALUES ('15ae6e3fcd884d85af9816b49750ee49', '248649d82150438c85819e0ccec85f34', 'page_count', 'aaaa', '页数', '12', null, '0', '1', 'int', '10', '0', '', '', '', '', 'text', '', '120', null, '0', '', '', '0', '1', '1', '0', 'single', '', '', 'admin', '2022-03-02 23:32:49', '2022-03-02 15:34:33', 'admin', '', '', '', '', '', 'text', '0', null, null, '0', null, null, null, null, null, null);
@@ -2130,7 +2130,7 @@ INSERT INTO `onl_cgform_field` VALUES ('c9d6effa04a4e92baf450d293514a815', '91c6
 INSERT INTO `onl_cgform_field` VALUES ('ca3c1eaf0077f5d337e92809c0e76fc8', '90492909f5e047988a55c3cca893983e', 'state', 'aaaa', '标识', '11', null, '0', '1', 'string', '10', '0', '', '', '', '', 'text', '', '120', null, '0', '', '', '0', '1', '1', '0', 'single', '', '', 'admin', '2022-05-24 16:24:12', '2022-05-24 15:08:56', 'admin', '', '', '', '', '', 'text', '0', null, null, '0', null, null, null, null, null, null);
 INSERT INTO `onl_cgform_field` VALUES ('ca5d185bb3b6afcc375870c4f871ae30', '891a5f26e9224ddfb811441c1947d20e', 'create_time', 'aaaa', '创建日期', '3', null, '0', '1', 'Date', '20', '0', '', '', '', '', 'datetime', '', '120', null, '0', '', '', '0', '0', '0', '0', 'single', '', '', 'admin', '2022-05-18 11:14:18', '2022-05-18 10:49:36', 'admin', '', '', '', '', '', null, '0', null, null, '0', null, null, null, '0', null, null);
 INSERT INTO `onl_cgform_field` VALUES ('caa78827083a8ba676af5ba0700c90a1', '08a0edb01bb148899530be6e981791bc', 'creation_time', 'aaaa', '创建日期', '3', null, '0', '1', 'Date', '20', '0', '', '', '', '', 'datetime', '', '120', null, '0', '', '', '0', '0', '0', '0', 'single', '', '', 'admin', '2022-03-02 23:30:18', '2022-03-02 15:58:19', 'admin', '', '', '', '', '', null, '0', null, null, '0', null, null, null, null, null, null);
-INSERT INTO `onl_cgform_field` VALUES ('caae2c9872fabf006080d78dcad188a6', '48308196e7b04761b533dc31bc899707', 'issue_time', 'Issue Date', '发布日期', '10', null, '0', '1', 'Date', '0', '0', '', '', '', '', '5', '', '120', null, '1', '', '', '1', '1', '1', '1', 'single', '', '', 'admin', '2022-06-06 16:05:28', '2022-01-21 14:37:40', 'admin', '', '', '', '', '', 'date', '0', null, null, '0', '1499657602378825729', '0', '1', '0', '1', null);
+INSERT INTO `onl_cgform_field` VALUES ('caae2c9872fabf006080d78dcad188a6', '48308196e7b04761b533dc31bc899707', 'issue_time', 'Issue Date', '发布日期', '10', null, '0', '1', 'Date', '0', '0', '', '', '', '', '5', '', '120', null, '0', '', '', '1', '1', '1', '1', 'single', '', '', 'admin', '2022-06-06 16:05:28', '2022-01-21 14:37:40', 'admin', '', '', '', '', '', 'date', '0', null, null, '0', '1499657602378825729', '0', '1', '0', '1', null);
 INSERT INTO `onl_cgform_field` VALUES ('caf689f3d260bf4041e4fb2938c134bc', '402813817eebc6c9017eebc6cffa0002', 'index_name', null, '索引名称', '3', 'index_name', '0', '1', 'string', '100', '0', null, null, null, null, 'text', null, '120', null, '0', null, null, '0', '1', '1', '0', 'single', null, null, null, null, '2022-02-12 10:33:02', 'admin', null, null, null, null, null, null, null, null, null, null, null, null, null, '0', null, null);
 INSERT INTO `onl_cgform_field` VALUES ('cb467de83e159204955a4e5fe2e97658', 'b78987f2cce64d0dbd98fceec73e824e', 'sys_org_code', 'aaaa', '所属部门', '6', null, '0', '1', 'string', '64', '0', '', '', '', '', 'text', '', '120', null, '0', '', '', '0', '0', '0', '0', 'single', '', '', 'admin', '2022-05-20 13:38:23', '2022-05-20 13:35:01', 'admin', '', '', '', '', '', null, '0', null, null, '0', null, null, null, null, null, null);
 INSERT INTO `onl_cgform_field` VALUES ('cb7da49a981a1b0acc5f7e8a0130bdcd', 'd35109c3632c4952a19ecc094943dd71', 'user_code', null, '用户编码', '11', null, '0', '1', 'String', '32', '0', '', '', '', '', 'text', '', '120', null, '0', '', '', '1', '1', '0', '0', 'single', '', '', 'ning.chen', '2022-05-10 11:24:53', '2019-05-11 16:26:37', 'admin', '', '', '', '', '', null, '0', null, null, '0', null, null, null, '0', null, null);
@@ -3963,9 +3963,7 @@ CREATE TABLE `qrtz_scheduler_state` (
 -- ----------------------------
 -- Records of qrtz_scheduler_state
 -- ----------------------------
-INSERT INTO `qrtz_scheduler_state` VALUES ('MyScheduler', 'DESKTOP-1C20D6T1655456515979', '1655457475134', '10000');
-INSERT INTO `qrtz_scheduler_state` VALUES ('MyScheduler', 'DESKTOP-48T7POT1655451321524', '1655457478061', '10000');
-INSERT INTO `qrtz_scheduler_state` VALUES ('MyScheduler', 'DESKTOP-F68BMEL1655433425835', '1655457475187', '10000');
+INSERT INTO `qrtz_scheduler_state` VALUES ('MyScheduler', 'DESKTOP-48T7POT1655451321524', '1655537284521', '10000');

 -- ----------------------------
 -- Table structure for qrtz_simple_triggers
@@ -4042,10 +4040,10 @@ CREATE TABLE `qrtz_triggers` (
 -- ----------------------------
 -- Records of qrtz_triggers
 -- ----------------------------
-INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.designComplianceJob', 'DEFAULT', 'com.jero.modules.project.job.designComplianceJob', 'DEFAULT', null, '1655515921000', '-1', '5', 'WAITING', 'CRON', '1655433841000', '0', null, '0', '');
-INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.InventoryAffirmJob', 'DEFAULT', 'com.jero.modules.project.job.InventoryAffirmJob', 'DEFAULT', null, '1655515861000', '-1', '5', 'WAITING', 'CRON', '1655433825000', '0', null, '0', '');
-INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.PrehomoJob', 'DEFAULT', 'com.jero.modules.project.job.PrehomoJob', 'DEFAULT', null, '1655515981000', '-1', '5', 'WAITING', 'CRON', '1655433857000', '0', null, '0', '');
-INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.VerifyComplianceJob', 'DEFAULT', 'com.jero.modules.project.job.VerifyComplianceJob', 'DEFAULT', null, '1655516041000', '-1', '5', 'WAITING', 'CRON', '1655433872000', '0', null, '0', '');
+INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.designComplianceJob', 'DEFAULT', 'com.jero.modules.project.job.designComplianceJob', 'DEFAULT', null, '1655602321000', '1655515921000', '5', 'WAITING', 'CRON', '1655433841000', '0', null, '0', '');
+INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.InventoryAffirmJob', 'DEFAULT', 'com.jero.modules.project.job.InventoryAffirmJob', 'DEFAULT', null, '1655602261000', '1655515861000', '5', 'WAITING', 'CRON', '1655433825000', '0', null, '0', '');
+INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.PrehomoJob', 'DEFAULT', 'com.jero.modules.project.job.PrehomoJob', 'DEFAULT', null, '1655602381000', '1655515981000', '5', 'WAITING', 'CRON', '1655433857000', '0', null, '0', '');
+INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.project.job.VerifyComplianceJob', 'DEFAULT', 'com.jero.modules.project.job.VerifyComplianceJob', 'DEFAULT', null, '1655602441000', '1655516041000', '5', 'WAITING', 'CRON', '1655433872000', '0', null, '0', '');
 INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleJob', 'DEFAULT', 'com.jero.modules.quartz.job.SampleJob', 'DEFAULT', null, '1588405730000', '1588405729000', '5', 'PAUSED', 'CRON', '1588405237000', '0', null, '0', '');
 INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.quartz.job.SampleParamJob', 'DEFAULT', 'com.jero.modules.quartz.job.SampleParamJob', 'DEFAULT', null, '1588405236000', '1588405235000', '5', 'PAUSED', 'CRON', '1588405221000', '0', null, '0', '');
 INSERT INTO `qrtz_triggers` VALUES ('MyScheduler', 'com.jero.modules.space.job.SpaceJobHandler', 'DEFAULT', 'com.jero.modules.space.job.SpaceJobHandler', 'DEFAULT', null, '1655256998000', '1655256993000', '5', 'ERROR', 'CRON', '1655174793000', '0', null, '0', '');
@@ -14401,6 +14399,9 @@ CREATE TABLE `sys_log` (
 -- ----------------------------
 -- Records of sys_log
 -- ----------------------------
+INSERT INTO `sys_log` VALUES ('1537726368656285697', '1', '用户名: 开发管理员,退出成功！', null, 'admin', '开发管理员', '127.0.0.1', null, null, null, null, null, null, '2022-06-17 17:18:31', null, null);
+INSERT INTO `sys_log` VALUES ('1537731151186120706', '1', '用户名: 开发管理员,退出成功！', null, 'admin', '开发管理员', '127.0.0.1', null, null, null, null, null, null, '2022-06-17 17:37:31', null, null);
+INSERT INTO `sys_log` VALUES ('1537731153891446785', '1', '用户名: 开发管理员,退出成功！', null, 'admin', '开发管理员', '127.0.0.1', null, null, null, null, null, null, '2022-06-17 17:37:31', null, null);

 -- ----------------------------
 -- Table structure for sys_permission
@@ -14749,7 +14750,6 @@ CREATE TABLE `sys_role_permission` (
 -- ----------------------------
 -- Records of sys_role_permission
 -- ----------------------------
-INSERT INTO `sys_role_permission` VALUES ('0c6b8facbb1cc874964c87a8cf01e4b1', 'f6817f48af4fb3af11b9e8bf182f618b', '841057b8a1bef8f6b4b20f9a618a7fa6', null, null, null);
 INSERT INTO `sys_role_permission` VALUES ('1209423580355481602', 'f6817f48af4fb3af11b9e8bf182f618b', '190c2b43bec6a5f7a4194a85db67d96a', null, null, null);
 INSERT INTO `sys_role_permission` VALUES ('1269526122208522241', 'f6817f48af4fb3af11b9e8bf182f618b', '1267412134208319489', null, null, null);
 INSERT INTO `sys_role_permission` VALUES ('126ea9faebeec2b914d6d9bef957afb6', 'f6817f48af4fb3af11b9e8bf182f618b', 'f1cb187abf927c88b89470d08615f5ac', null, null, null);
@@ -14904,7 +14904,6 @@ INSERT INTO `sys_role_permission` VALUES ('1507175486076260357', '28', '14992127
 INSERT INTO `sys_role_permission` VALUES ('1507175486076260358', '28', '53a9230444d33de28aa11cc108fb1dba', null, '2022-03-25 10:00:12', '180.212.210.237');
 INSERT INTO `sys_role_permission` VALUES ('1507175486076260359', '28', '1371831353354936322', null, '2022-03-25 10:00:12', '180.212.210.237');
 INSERT INTO `sys_role_permission` VALUES ('1507175486076260360', '28', '58857ff846e61794c69208e9d3a85466', null, '2022-03-25 10:00:12', '180.212.210.237');
-INSERT INTO `sys_role_permission` VALUES ('1507175486080454657', '28', '841057b8a1bef8f6b4b20f9a618a7fa6', null, '2022-03-25 10:00:12', '180.212.210.237');
 INSERT INTO `sys_role_permission` VALUES ('1507175486080454658', '28', 'd7d6e2e4e2934f2c9385a623fd98c6f3', null, '2022-03-25 10:00:12', '180.212.210.237');
 INSERT INTO `sys_role_permission` VALUES ('1507175486080454659', '28', '3f915b2769fc80648e92d04e84ca059d', null, '2022-03-25 10:00:12', '180.212.210.237');
 INSERT INTO `sys_role_permission` VALUES ('1507175486080454660', '28', '1260928341675982849', null, '2022-03-25 10:00:12', '180.212.210.237');
@@ -15054,7 +15053,6 @@ INSERT INTO `sys_role_permission` VALUES ('1516352593791504397', '3', '190c2b43b
 INSERT INTO `sys_role_permission` VALUES ('1516352593791504398', '3', '45c966826eeff4c99b8f8ebfe74511fc', null, '2022-04-19 17:46:45', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516352593791504399', '3', '1484415532234330114', null, '2022-04-19 17:46:45', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516352593791504400', '3', '109c78a583d4693ce2f16551b7786786', null, '2022-04-19 17:46:45', '127.0.0.1');
-INSERT INTO `sys_role_permission` VALUES ('1516352593791504401', '3', '841057b8a1bef8f6b4b20f9a618a7fa6', null, '2022-04-19 17:46:45', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516352593791504402', '3', '1192318987661234177', null, '2022-04-19 17:46:45', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516352593799892994', '3', '1485454419484393473', null, '2022-04-19 17:46:45', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516352593799892995', '3', '1485788804943355906', null, '2022-04-19 17:46:45', '127.0.0.1');
@@ -15155,7 +15153,6 @@ INSERT INTO `sys_role_permission` VALUES ('1516355715007942668', '5', '45c966826
 INSERT INTO `sys_role_permission` VALUES ('1516355715007942669', '5', '1484415532234330114', null, '2022-04-19 17:59:10', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516355715007942670', '5', '1500681954729517057', null, '2022-04-19 17:59:10', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516355715007942671', '5', '109c78a583d4693ce2f16551b7786786', null, '2022-04-19 17:59:10', '127.0.0.1');
-INSERT INTO `sys_role_permission` VALUES ('1516355715007942672', '5', '841057b8a1bef8f6b4b20f9a618a7fa6', null, '2022-04-19 17:59:10', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516355715007942673', '5', '1192318987661234177', null, '2022-04-19 17:59:10', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516355715016331265', '5', '1485454419484393473', null, '2022-04-19 17:59:10', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516355715016331266', '5', '1485788804943355906', null, '2022-04-19 17:59:10', '127.0.0.1');
@@ -15250,7 +15247,6 @@ INSERT INTO `sys_role_permission` VALUES ('1516358535471861775', '17', '3f915b27
 INSERT INTO `sys_role_permission` VALUES ('1516358535471861776', '17', '190c2b43bec6a5f7a4194a85db67d96a', null, '2022-04-19 18:10:22', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516358535471861777', '17', '45c966826eeff4c99b8f8ebfe74511fc', null, '2022-04-19 18:10:22', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516358535471861778', '17', '109c78a583d4693ce2f16551b7786786', null, '2022-04-19 18:10:22', '127.0.0.1');
-INSERT INTO `sys_role_permission` VALUES ('1516358535471861779', '17', '841057b8a1bef8f6b4b20f9a618a7fa6', null, '2022-04-19 18:10:22', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516358535480250370', '17', '1192318987661234177', null, '2022-04-19 18:10:22', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516358535480250371', '17', '1485454419484393473', null, '2022-04-19 18:10:22', '127.0.0.1');
 INSERT INTO `sys_role_permission` VALUES ('1516358535480250372', '17', '1500709129079873538', null, '2022-04-19 18:10:22', '127.0.0.1');
@@ -26,6 +26,7 @@ import com.jero.common.util.RedisUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.base.service.BaseCommonService;
 import com.jero.modules.system.entity.*;
+import com.jero.modules.system.enums.UserOrDepartEnum;
 import com.jero.modules.system.model.DepartIdModel;
 import com.jero.modules.system.model.SysUserSysDepartModel;
 import com.jero.modules.system.service.*;
@@ -1554,6 +1555,7 @@ public class SysUserController {
                SysUserDepartVO sysUserDepartVO = new SysUserDepartVO();
                sysUserDepartVO.setKey(sysDepart.getId());
                sysUserDepartVO.setTitle(sysDepart.getDepartName());
+                sysUserDepartVO.setFlag(UserOrDepartEnum.USER.getValue());
                list.add(sysUserDepartVO);
            }
        }
@@ -1562,6 +1564,7 @@ public class SysUserController {
                SysUserDepartVO sysUserDepartVO = new SysUserDepartVO();
                sysUserDepartVO.setKey(sysUser.getId());
                sysUserDepartVO.setTitle(sysUser.getUsername());
+                sysUserDepartVO.setFlag(UserOrDepartEnum.DEPART.getValue());
                list.add(sysUserDepartVO);
            }
        }
@@ -0,0 +1,28 @@
+package com.jero.modules.system.enums;
+
+/**
+ * @Author: liyawei
+ * @Description:
+ * @Date: Created in 14:12 2022/5/26
+ */
+public enum UserOrDepartEnum {
+
+    USER("同步部门","USER"),
+    DEPART("同步用户","DEPART");
+
+    private String name;
+    private String value;
+
+    private UserOrDepartEnum(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
@@ -11,6 +11,8 @@ public class SysUserDepartVO {

    private String title;

+    private String flag; //depart，user 2个属性
+
    public String getKey() {
        return key;
    }
@@ -26,4 +28,12 @@ public class SysUserDepartVO {
    public void setTitle(String title) {
        this.title = title;
    }
+
+    public String getFlag() {
+        return flag;
+    }
+
+    public void setFlag(String flag) {
+        this.flag = flag;
+    }
 }
@@ -608,10 +608,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
            if ("issue_time".equals(onlCgformField.getDbFieldName())) {
                map.put("sort", "true");//列表排序标识
            }
-//            if ("issue_time".equals(onlCgformField.getDbFieldName())
-//                    || "implement_time".equals(onlCgformField.getDbFieldName())) {
-//                map.put("sort", "true");//列表排序标识
-//            }
            map.put("db_field_name", onlCgformField.getDbFieldName());//字段
            if (CutEnum.CN.getValue().equals(cut)) {
                map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名
@@ -1592,16 +1588,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi

            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
            String issueTime = (String) (map.get("issue_time"));
-            Date issueTimeDate = df.parse(issueTime);
+            Date issueTimeDate = null;
+            if(StringUtils.isNotBlank(issueTime)){
+                issueTimeDate = df.parse(issueTime);
+            }
            String implementTime = (String) map.get("implement_time");//在产车实施日期
            String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期
-            if (StringUtils.isNotBlank(implementTime)) {
+            if (StringUtils.isNotBlank(implementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                Date implementTimeDate = df.parse(implementTime);
                if (issueTimeDate.after(implementTimeDate)) {
                    throw new JeroBootException("发布日期不能大于在产车实施日期");
                }
            }
-            if (StringUtils.isNotBlank(newCarimplementTime)) {
+            if (StringUtils.isNotBlank(newCarimplementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                Date newCarimplementTimeDate = df.parse(newCarimplementTime);
                if (issueTimeDate.after(newCarimplementTimeDate)) {
                    throw new JeroBootException("发布日期不能大于新车型实施日期");
@@ -2201,16 +2200,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
        try {
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
            String issueTime = (String) map.get("issue_time");
-            Date issueTimeDate = df.parse(issueTime);
+            Date issueTimeDate = null;
+            if(StringUtils.isNotBlank(issueTime)){
+                issueTimeDate = df.parse(issueTime);
+            }
            String implementTime = (String) map.get("implement_time");//在产车实施日期
            String newCarimplementTime = (String) map.get("xin1_che1_xing2_shi2_shi1_ri4_qi1");//新车型实施日期
-            if (StringUtils.isNotBlank(implementTime)) {
+            if (StringUtils.isNotBlank(implementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                Date implementTimeDate = df.parse(implementTime);
                if (issueTimeDate.after(implementTimeDate)) {
                    throw new JeroBootException("发布日期不能大于在产车实施日期");
                }
            }
-            if (StringUtils.isNotBlank(newCarimplementTime)) {
+            if (StringUtils.isNotBlank(newCarimplementTime) && ObjectUtils.isNotEmpty(issueTimeDate)) {
                Date newCarimplementTimeDate = df.parse(newCarimplementTime);
                if (issueTimeDate.after(newCarimplementTimeDate)) {
                    throw new JeroBootException("发布日期不能大于新车型实施日期");
@@ -11,6 +11,7 @@ import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
 import com.jero.modules.dummy.enums.InventoryStateEnum;
 import com.jero.modules.dummy.service.IDummyInventoryBaseEOService;
+import com.jero.modules.dummy.vo.VirtualCreaterVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -110,6 +111,20 @@ public class DummyInventoryBaseEOController extends JeroController<DummyInventor
 		return Result.OK("编辑成功!");
 	}

+	 /**
+	  *  设置创建人
+	  *
+	  * @param virtualCreaterVo
+	  * @return
+	  */
+	 @AutoLog(value = "虚拟清单基础表-设置创建人")
+	 @ApiOperation(value="虚拟清单基础表-设置创建人", notes="虚拟清单基础表-设置创建人")
+	 @PostMapping(value = "/setCreater")
+	 public Result<?> setCreater(@RequestBody VirtualCreaterVo virtualCreaterVo) {
+		 dummyInventoryBaseEOService.setCreater(virtualCreaterVo);
+		 return Result.OK("编辑成功!");
+	 }
+
 	/**
 	 *   通过id删除
 	 *
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
+import com.jero.modules.dummy.vo.VirtualCreaterVo;

 import java.util.List;

@@ -32,6 +33,14 @@ public interface IDummyInventoryBaseEOService extends IService<DummyInventoryBas
 	 */
    void editById(DummyInventoryBaseEO dummyInventoryBaseEO);

+	/**
+	 * 虚拟清单创建人更新
+	 *
+	 * @param VirtualCreaterVo
+	 * @return
+	 */
+	void setCreater(VirtualCreaterVo virtualCreaterVo);
+
 	/**
 	 * 发布
 	 * @param dummyInventoryBaseEO
@@ -24,6 +24,7 @@ import com.jero.modules.dummy.service.IDummyInventoryBaseEOService;
 import com.jero.modules.dummy.service.IDummyInventoryInfoEOService;
 import com.jero.modules.dummy.service.IDummyReadEOService;
 import com.jero.modules.dummy.util.ListDiff;
+import com.jero.modules.dummy.vo.VirtualCreaterVo;
 import com.jero.modules.feishu.service.IFeishuService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
@@ -116,7 +117,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
    @Override
    public void editById(DummyInventoryBaseEO dummyInventoryBaseEO) {
        DummyInventoryBaseEO baseEO = queryById(dummyInventoryBaseEO.getId());
-        List<String> createByNameList =new ArrayList<>();
+        List<String> createByNameList = new ArrayList<>();
        if (StringUtils.isNotBlank(dummyInventoryBaseEO.getCreateBy())) {
            createByNameList = Arrays.asList(dummyInventoryBaseEO.getCreateBy().split(","));

@@ -140,7 +141,15 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
        saveOrUpdate(dummyInventoryBaseEO);
    }

-
+    @Override
+    public void setCreater(VirtualCreaterVo virtualCreaterVo) {
+        String[] idList = virtualCreaterVo.getIds().split(",");
+        for (int i = 0; i < idList.length; i++){
+            DummyInventoryBaseEO baseEO = queryById(idList[i]);
+            baseEO.setCreateBy(virtualCreaterVo.getCreateBy());
+            saveOrUpdate(baseEO);
+        }
+    }

    /**
     * 通过id删除
@@ -0,0 +1,16 @@
+package com.jero.modules.dummy.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value="VirtualCreaterVo对象", description="虚拟清单创建人修改VO")
+public class VirtualCreaterVo {
+
+    // 需要修改的虚拟清单id，可能多个
+    private String ids;
+
+    // 需要修改的创建人
+    private String createBy;
+
+}
@@ -34,10 +34,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;

@@ -75,9 +76,7 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
            ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*",""));
        }
 //        List<SysUser> sysUserList = sysUserService.list();
-        QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
-        userQueryWrapper.select("id", "username");
-        List<SysUser> sysUserList = this.sysUserService.list(userQueryWrapper);
+

        ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue());
        ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue());
@@ -97,6 +96,25 @@ public class NcrTrackServiceImpl extends ServiceImpl<NcrTrackMapper, NcrTrackVO>
            verifyName = "Verify conformance validation";
        }
        List<SysDictItem> dictItemList = sysDictItemServiceImpl.selectItemsAll();
+        Set<String> userIdSet = new HashSet<>();
+        for (NcrTrackVO trackVO : infoList) {
+            if(StringUtils.isNotBlank(trackVO.getDesignInitiatorId())){
+                userIdSet.add(trackVO.getDesignInitiatorId());
+            }
+            if(StringUtils.isNotBlank(trackVO.getPrehomoInitiatorId())){
+                userIdSet.add(trackVO.getPrehomoInitiatorId());
+            }
+            if(StringUtils.isNotBlank(trackVO.getVerifyInitiatorId())){
+                userIdSet.add(trackVO.getVerifyInitiatorId());
+            }
+        }
+        List<SysUser> sysUserList = new ArrayList<>();
+        if(userIdSet.size() != 0){
+            QueryWrapper<SysUser> userQueryWrapper = new QueryWrapper<>();
+            userQueryWrapper.lambda().in(SysUser::getId,userIdSet);
+            userQueryWrapper.select("id", "username");
+            sysUserList = this.sysUserService.list(userQueryWrapper);
+        }
        for (NcrTrackVO trackVO : infoList) {
            //责任领域中英文切换
            if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){
@@ -164,7 +164,11 @@
      },
      getUserAndDepart() {
        getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
-          this.gData = res || []
+          if (res){
+            this.gData = res.filter(ele => ele.flag === 'DEPART');
+          } else {
+            this.gData = []
+          }
          this.visibleTree = true
        })
      },
@@ -241,7 +241,7 @@
  }

  .box-input {
-    min-width: 200px;
+    /*min-width: 200px;*/
    display: inline-block;
    width: 70%;
    height: 38px;
@@ -0,0 +1,254 @@
+<template>
+  <a-form layout="inline" @keyup.enter.native="searchQuery">
+    <a-row :gutter="24">
+      <a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+        <template v-if="index < 3">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              tree-node-filter-prop="title"
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+        <template v-if="index >= 3 && toggleSearchStatus">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              tree-node-filter-prop="title"
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+      </a-col>
+      <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+         <a-col :md="4" :sm="24" style='display: flex'>
+            <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+            <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+          <a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
+            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+          </a>
+         </a-col>
+      </span>
+    </a-row>
+  </a-form>
+</template>
+
+<script>
+import { getAction } from '@/api/manage'
+import eventBUs from '../../common/event.js'
+import moment from 'moment'
+
+export default {
+  name: 'index',
+  props: {
+    url: {
+      type: Object,
+      default: {}
+    },
+    flag: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      queryParam: {},
+      toggleSearchStatus: false,
+      searchList: []
+    }
+  },
+  mounted() {
+    this.getSeach()
+  },
+  methods: {
+    searchQuery() {
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+    },
+    searchReset() {
+      this.queryParam = {}
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+    },
+    getSeach() {
+      let params = {
+        flag: this.flag
+      }
+      getAction(this.url.seachList, params).then((res) => {
+        if (res.success) {
+          this.searchList = res.result
+        }
+      })
+    },
+    // handleToggleSearch() {
+    //   this.toggleSearchStatus = !this.toggleSearchStatus
+    // },
+    dateChange(item) {
+      this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
+    },
+    onChange(item) {
+      if (this.queryParam[item] && this.queryParam[item].length > 0) {
+        let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD')
+        let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD')
+        this.queryParam[item] = [dateOne, dateTwo]
+      } else {
+        this.queryParam[item] = []
+      }
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+</style>
@@ -1,7 +1,7 @@
 <template>
  <a-form layout="inline" @keyup.enter.native="searchQuery">
    <a-row :gutter="24">
-      <a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+      <a-col :md="6" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
        <template v-if="index < 3">
          <div class="box-title-text" v-if="item.field_show_type == '0'">
            <div class="title-text" :title="item.db_field_txt">
@@ -0,0 +1,255 @@
+<template>
+  <a-form layout="inline" @keyup.enter.native="searchQuery">
+    <a-row :gutter="24">
+      <a-col :md="10" :sm="8" v-for="(item,index) in searchList" :key="index" style="line-height: 48px">
+        <template v-if="index < 3">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              tree-node-filter-prop="title"
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+        <template v-if="index >= 3 && toggleSearchStatus">
+          <div class="box-title-text" v-if="item.field_show_type == '0'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-tree-select
+              tree-node-filter-prop="title"
+              class="box-input"
+              v-model="queryParam[item.db_field_name]"
+              :maxTagCount="1"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              :tree-data="item.tree"
+              tree-checkable
+              :placeholder="$t('PleaseSelect')+item.db_field_txt"
+            />
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '1' || item.field_show_type == '8' ||
+          item.field_show_type == '9' || item.field_show_type == '10' || item.field_show_type == '11'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                     v-model="queryParam[item.db_field_name]"></a-input>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '2'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-input-number class="box-input" :placeholder="$t('PleaseEnter')+item.db_field_txt"
+                            v-model="queryParam[item.db_field_name]" :min="1" :max="99999999"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '4'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-multi-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                                :placeholder="$t('PleaseSelect')+item.db_field_txt" :type="'select'"
+                                :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+          <div class="box-title-text" v-else-if="item.field_show_type == '6' || item.field_show_type == '5'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <a-range-picker class="box-input" v-model="queryParam[item.db_field_name]"
+                            @change="onChange(item.db_field_name)"></a-range-picker>
+          </div>
+          <!--          <div class="box-title-text" v-else-if="item.field_show_type == '5'">-->
+          <!--            <div class="title-text" :title="item.db_field_txt">-->
+          <!--              <span>{{item.db_field_txt}}</span>-->
+          <!--            </div>-->
+          <!--            <a-date-picker class="box-input"-->
+          <!--                           :placeholder="$t('PleaseSelect')+item.db_field_txt"-->
+          <!--                           @change="dateChange(item.db_field_name)"-->
+          <!--                           v-model="queryParam[item.db_field_name]"/>-->
+          <!--          </div>-->
+          <div class="box-title-text" v-else-if="item.field_show_type == '3'">
+            <div class="title-text" :title="item.db_field_txt">
+              <span>{{item.db_field_txt}}</span>
+            </div>
+            <j-dict-select-tag class="box-input" v-model="queryParam[item.db_field_name]"
+                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
+                               :type="'select'"
+                               :triggerChange="false" :dictCode="item.dict_field"/>
+          </div>
+        </template>
+
+      </a-col>
+      <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+         <a-col :md="6" :sm="24">
+            <a-button class="box-button" type="primary" @click="searchQuery">{{$t('query')}}</a-button>
+            <a-button class="box-button" style="margin-left: 8px" @click="searchReset">{{$t('reset')}}</a-button>
+          <a @click="handleToggleSearch" style="margin-left: 8px" v-if="searchList.length > 3">
+            {{ !toggleSearchStatus ? $t('open') : $t('away') }}
+            <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+          </a>
+         </a-col>
+      </span>
+    </a-row>
+  </a-form>
+</template>
+
+<script>
+import { getAction } from '@/api/manage'
+import eventBUs from '../../common/event.js'
+import moment from 'moment'
+
+export default {
+  name: 'index',
+  props: {
+    url: {
+      type: Object,
+      default: {}
+    },
+    flag: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      queryParam: {},
+      toggleSearchStatus: false,
+      searchList: []
+    }
+  },
+  mounted() {
+    this.getSeach()
+  },
+  methods: {
+    searchQuery() {
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+    },
+    searchReset() {
+      this.queryParam = {}
+      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+    },
+    getSeach() {
+      let params = {
+        flag: this.flag
+      }
+      getAction(this.url.seachList, params).then((res) => {
+        if (res.success) {
+          this.searchList = res.result
+        }
+      })
+    },
+    // handleToggleSearch() {
+    //   this.toggleSearchStatus = !this.toggleSearchStatus
+    // },
+    dateChange(item) {
+      this.queryParam[item] = moment(this.queryParam[item]).format('YYYY-MM-DD')
+    },
+    onChange(item) {
+      if (this.queryParam[item] && this.queryParam[item].length > 0) {
+        let dateOne = moment(this.queryParam[item][0]).format('YYYY-MM-DD')
+        let dateTwo = moment(this.queryParam[item][1]).format('YYYY-MM-DD')
+        this.queryParam[item] = [dateOne, dateTwo]
+      } else {
+        this.queryParam[item] = []
+      }
+    },
+    handleToggleSearch() {
+      this.toggleSearchStatus = !this.toggleSearchStatus
+    }
+  }
+}
+</script>
+
+<style scoped>
+.box-title-text {
+  line-height: 1.4;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+
+.title-text {
+  width: 20%;
+  min-width: 110px;
+  color: #000F16;
+  display: inline-block;
+  font-weight: 500;
+  font-size: 14px;
+  margin-right: 16px;
+  margin-top: 3px;
+  text-align: right;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.box-input {
+  min-width: 200px;
+  display: inline-block;
+  width: 70%;
+  height: 38px;
+  margin-top: 2px;
+}
+
+.box-button {
+  height: 38px;
+  /*margin-top: 2px;*/
+}
+</style>
@@ -105,12 +105,12 @@
          return
        }
        let query = {
-          id: this.tableKey,
+          ids: this.tableKey,
          createBy: this.userName.join(',')
        }
        this.submitLoading = true
        this.confirmLoading = true
-        postAction('/dummy/dummyInventoryBaseEO/edit', query).then((res) => {
+        postAction('/dummy/dummyInventoryBaseEO/setCreater', query).then((res) => {
          this.confirmLoading = false
          this.submitLoading = false
          if (res.success) {
@@ -136,7 +136,11 @@
      },
      getUserAndDepart() {
        getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
-          this.gData = res || []
+          if (res){
+            this.gData = res.filter(ele => ele.flag === 'DEPART');
+          } else {
+            this.gData = []
+          }
          this.visibleTree = true
        })
      },
@@ -11,7 +11,7 @@
      >
        <div class="doc-table-content">
          <div class="doc-header">
-            <searchaloneorc :url="url" :flag="'condition'"></searchaloneorc>
+            <searchaloneorcFile :url="url" :flag="'condition'"></searchaloneorcFile>
          </div>
        </div>
        <div class="doc-table-detail">
@@ -34,13 +34,13 @@

 <script>
  import { getAction, postAction, deleteAction } from '@/api/manage'
-  import searchaloneorc from '@/components/searchaloneorc/index'
+  import SearchaloneorcFile from '@/components/searchaloneorcfile/index'
  import TableData from '@/components/OcrTable/DocTable'
  import eventBUs from '../../../../common/event'
  export default {
    name: 'docTable',
    components:{
-      searchaloneorc,
+      SearchaloneorcFile,
      TableData,

    },
@@ -60,7 +60,7 @@
 <script>
  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
  import SplitUpload from '@/components/importSplitUpload/index'
-  import search from '@/components/search/index'
+  import search from '@/components/searchalonetext/index'
  import TableData from '@/components/SplitTable/DocTable'
  import axios from 'axios'
  import { ACCESS_TOKEN } from '@/store/mutation-types'
@@ -11,7 +11,7 @@
      >
        <div class="split-table-content">
          <div class="split-header">
-            <search :url="url" :flag="'condition'"></search>
+            <searchAlone :url="url" :flag="'condition'"></searchAlone>
          </div>
        </div>
        <div class="table-operator operator-select">
@@ -21,7 +21,7 @@

            <div  class="operator-select-type">
              <span class="operator-file-type"><i class="operator-i">*</i>{{$t('fileType')}}</span>
-              <a-select v-model="fileGroup" :placeholder="$t('selectFileType')" class="file-type-select">
+              <a-select v-model="fileGroup" style='min-width: 295px' :placeholder="$t('selectFileType')" class="file-type-select">
                <a-select-option value="GSO" key="GSO" :title="$t('GSO')">
                  {{$t('GSO')}}
                </a-select-option>
@@ -75,7 +75,7 @@

 <script>
  import { getAction, postAction } from '../../../../api/manage'
-  import search from '@/components/search/index'
+  import SearchAlone from '@/components/searchalonetext/index'
  import TableData from '@/components/SplitTable/DocTable'
  import eventBUs from '../../../../common/event'
  import Vue from 'vue'
@@ -86,7 +86,7 @@
  export default {
    name: 'split',
    components:{
-      search,
+      SearchAlone,
      TableData,
    },
    data(){