From c1c2f1e44add6bd4d8432cc320ff7238dc782c13 Mon Sep 17 00:00:00 2001 From: zhangdaihao Date: Mon, 20 May 2019 11:47:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3SqlServer=E3=80=81oracle?= =?UTF-8?q?=EF=BC=8Cdemo=E8=A1=A8=E5=B0=91sys=5Forg=5Fcode=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=202.=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=A0=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=EF=BC=8C?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9D=83=E9=99=90=E6=B3=A8=E8=A7=A3=203.?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=89=8D=E7=AB=AF=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8C=87=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/system/UserList.vue | 4 +- jeecg-boot/db/jeecg-boot-oracle_11g.sql | 50 ++++++++++--------- jeecg-boot/db/jeecg-boot-sqlserver_2008.sql | 50 +++++++++---------- .../system/controller/SysUserController.java | 14 ------ 4 files changed, 53 insertions(+), 65 deletions(-) diff --git a/ant-design-jeecg-vue/src/views/system/UserList.vue b/ant-design-jeecg-vue/src/views/system/UserList.vue index 91f3898..9186b17 100644 --- a/ant-design-jeecg-vue/src/views/system/UserList.vue +++ b/ant-design-jeecg-vue/src/views/system/UserList.vue @@ -118,9 +118,9 @@ - 编辑 + 编辑 - + diff --git a/jeecg-boot/db/jeecg-boot-oracle_11g.sql b/jeecg-boot/db/jeecg-boot-oracle_11g.sql index 5e44d3e..8d02e85 100644 --- a/jeecg-boot/db/jeecg-boot-oracle_11g.sql +++ b/jeecg-boot/db/jeecg-boot-oracle_11g.sql @@ -34,7 +34,8 @@ CREATE TABLE "DEMO" ( "CREATE_BY" NVARCHAR2(32) NULL , "CREATE_TIME" DATE NULL , "UPDATE_BY" NVARCHAR2(32) NULL , -"UPDATE_TIME" DATE NULL +"UPDATE_TIME" DATE NULL , +"SYS_ORG_CODE" NVARCHAR2(64) NULL ) LOGGING NOCOMPRESS @@ -56,6 +57,8 @@ COMMENT ON COLUMN "DEMO"."CREATE_BY" IS '创建人'; COMMENT ON COLUMN "DEMO"."CREATE_TIME" IS '创建时间'; COMMENT ON COLUMN "DEMO"."UPDATE_BY" IS '修改人'; COMMENT ON COLUMN "DEMO"."UPDATE_TIME" IS '修改时间'; +COMMENT ON COLUMN "DEMO"."SYS_ORG_CODE" IS '所属部门编码'; + -- ---------------------------- -- Table structure for JEECG_MONTHLY_GROWTH_ANALYSIS @@ -2024,28 +2027,28 @@ Date: 2019-05-18 12:07:18 -- ---------------------------- -- Records of DEMO -- ---------------------------- -INSERT INTO "DEMO" VALUES ('08375a2dff80e821d5a158dd98302b23', '导入小虎', null, null, null, null, '2', '28', null, null, null, 'jeecg-boot', TO_DATE('2019-04-10 11:42:57', 'YYYY-MM-DD HH24:MI:SS'), null, null); -INSERT INTO "DEMO" VALUES ('1c2ba51b29a42d9de02bbd708ea8121a', '777777', '777', TO_DATE('2018-12-07 19:43:17', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, '7', TO_DATE('2018-12-07 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, null, 'admin', TO_DATE('2019-02-21 18:26:04', 'YYYY-MM-DD HH24:MI:SS')); -INSERT INTO "DEMO" VALUES ('1dc29e80be14d1400f165b5c6b30c707', 'zhang daihao', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, null, null, null, null); -INSERT INTO "DEMO" VALUES ('304e651dc769d5c9b6e08fb30457a602', '小白兔', null, null, null, null, '2', '28', null, null, null, 'scott', TO_DATE('2019-01-19 13:12:53', 'YYYY-MM-DD HH24:MI:SS'), 'qinfeng', TO_DATE('2019-01-19 13:13:12', 'YYYY-MM-DD HH24:MI:SS')); -INSERT INTO "DEMO" VALUES ('4', 'Sandy', '开源，很好', TO_DATE('2018-12-15 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, '2', '21', TO_DATE('2018-12-15 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'test4@baomidou.com', '聪明00', null, null, 'admin', TO_DATE('2019-02-25 16:29:27', 'YYYY-MM-DD HH24:MI:SS')); -INSERT INTO "DEMO" VALUES ('42c08b1a2e5b2a96ffa4cc88383d4b11', '秦50090', null, TO_DATE('2019-01-05 20:33:31', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, '28', TO_DATE('2019-01-05 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'admin', TO_DATE('2019-01-19 20:33:54', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-01-19 20:34:29', 'YYYY-MM-DD HH24:MI:SS')); -INSERT INTO "DEMO" VALUES ('4436302a0de50bb83025286bc414d6a9', 'zhang daihao', null, null, null, null, null, null, null, 'zhangdaiscott@163.com', null, 'admin', TO_DATE('2019-01-19 15:39:04', 'YYYY-MM-DD HH24:MI:SS'), null, null); -INSERT INTO "DEMO" VALUES ('4981637bf71b0c1ed1365241dfcfa0ea', '小虎', null, null, null, null, '2', '28', null, null, null, 'scott', TO_DATE('2019-01-19 13:12:53', 'YYYY-MM-DD HH24:MI:SS'), 'qinfeng', TO_DATE('2019-01-19 13:13:12', 'YYYY-MM-DD HH24:MI:SS')); -INSERT INTO "DEMO" VALUES ('5c16e6a5c31296bcd3f1053d5d118815', '导入zhangdaiscott', null, null, null, null, '1', null, TO_DATE('2019-01-03 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg-boot', TO_DATE('2019-04-10 11:42:57', 'YYYY-MM-DD HH24:MI:SS'), null, null); -INSERT INTO "DEMO" VALUES ('7', 'zhangdaiscott', null, null, null, null, '1', null, TO_DATE('2019-01-03 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, null, null, null); -INSERT INTO "DEMO" VALUES ('73bc58611012617ca446d8999379e4ac', '郭靖11a', '777', TO_DATE('2018-12-07 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 18:16:39', 'YYYY-MM-DD HH24:MI:SS'), null, null); -INSERT INTO "DEMO" VALUES ('917e240eaa0b1b2d198ae869b64a81c3', 'zhang daihao', null, null, null, null, '2', '0', TO_DATE('2018-11-29 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'zhangdaiscott@163.com', null, null, null, null, null); -INSERT INTO "DEMO" VALUES ('94420c5d8fc4420dde1e7196154b3a24', '秦111', null, null, null, null, null, null, null, null, null, 'scott', TO_DATE('2019-01-19 12:54:58', 'YYYY-MM-DD HH24:MI:SS'), 'qinfeng', TO_DATE('2019-01-19 13:12:10', 'YYYY-MM-DD HH24:MI:SS')); -INSERT INTO "DEMO" VALUES ('95740656751c5f22e5932ab0ae33b1e4', '杨康22a', '奸臣', null, null, null, null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 18:16:39', 'YYYY-MM-DD HH24:MI:SS'), null, null); -INSERT INTO "DEMO" VALUES ('b86897900c770503771c7bb88e5d1e9b', 'scott1', '开源、很好、hello', null, null, null, '1', null, null, 'zhangdaiscott@163.com', null, 'scott', TO_DATE('2019-01-19 12:22:34', 'YYYY-MM-DD HH24:MI:SS'), null, null); -INSERT INTO "DEMO" VALUES ('c0b7c3de7c62a295ab715943de8a315d', '秦风555', null, null, null, null, null, null, null, null, null, 'admin', TO_DATE('2019-01-19 13:18:30', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-01-19 13:18:50', 'YYYY-MM-DD HH24:MI:SS')); -INSERT INTO "DEMO" VALUES ('c28fa8391ef81d6fabd8bd894a7615aa', '小麦', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, 'jeecg-boot', TO_DATE('2019-04-04 17:18:09', 'YYYY-MM-DD HH24:MI:SS'), null, null); -INSERT INTO "DEMO" VALUES ('c2c0d49e3c01913067cf8d1fb3c971d2', 'zhang daihao', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, 'admin', TO_DATE('2019-01-19 23:37:18', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-01-21 16:49:06', 'YYYY-MM-DD HH24:MI:SS')); -INSERT INTO "DEMO" VALUES ('c96279c666b4b82e3ef1e4e2978701ce', '报名时间', null, null, null, null, null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 18:00:52', 'YYYY-MM-DD HH24:MI:SS'), null, null); -INSERT INTO "DEMO" VALUES ('d24668721446e8478eeeafe4db66dcff', 'zhang daihao999', null, null, null, null, '1', null, null, 'zhangdaiscott@163.com', null, null, null, null, null); -INSERT INTO "DEMO" VALUES ('eaa6c1116b41dc10a94eae34cf990133', 'zhang daihao', null, null, null, null, null, null, null, 'zhangdaiscott@163.com', null, null, null, null, null); -INSERT INTO "DEMO" VALUES ('ffa9da1ad40632dfcabac51d766865bd', '秦999', null, null, null, null, null, null, null, null, null, 'admin', TO_DATE('2019-01-19 23:36:34', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-14 17:30:43', 'YYYY-MM-DD HH24:MI:SS')); +INSERT INTO "DEMO" VALUES ('08375a2dff80e821d5a158dd98302b23', '导入小虎', null, null, null, null, '2', '28', null, null, null, 'jeecg-boot', TO_DATE('2019-04-10 11:42:57', 'YYYY-MM-DD HH24:MI:SS'), null, null, null); +INSERT INTO "DEMO" VALUES ('1c2ba51b29a42d9de02bbd708ea8121a', '777777', '777', TO_DATE('2018-12-07 19:43:17', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, '7', TO_DATE('2018-12-07 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, null, 'admin', TO_DATE('2019-02-21 18:26:04', 'YYYY-MM-DD HH24:MI:SS'), null); +INSERT INTO "DEMO" VALUES ('1dc29e80be14d1400f165b5c6b30c707', 'zhang daihao', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, null, null, null, null, null); +INSERT INTO "DEMO" VALUES ('304e651dc769d5c9b6e08fb30457a602', '小白兔', null, null, null, null, '2', '28', null, null, null, 'scott', TO_DATE('2019-01-19 13:12:53', 'YYYY-MM-DD HH24:MI:SS'), 'qinfeng', TO_DATE('2019-01-19 13:13:12', 'YYYY-MM-DD HH24:MI:SS'), null); +INSERT INTO "DEMO" VALUES ('4', 'Sandy', '开源，很好', TO_DATE('2018-12-15 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, '2', '21', TO_DATE('2018-12-15 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'test4@baomidou.com', '聪明00', null, null, 'admin', TO_DATE('2019-02-25 16:29:27', 'YYYY-MM-DD HH24:MI:SS'), null); +INSERT INTO "DEMO" VALUES ('42c08b1a2e5b2a96ffa4cc88383d4b11', '秦50090', null, TO_DATE('2019-01-05 20:33:31', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, '28', TO_DATE('2019-01-05 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'admin', TO_DATE('2019-01-19 20:33:54', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-01-19 20:34:29', 'YYYY-MM-DD HH24:MI:SS'), null); +INSERT INTO "DEMO" VALUES ('4436302a0de50bb83025286bc414d6a9', 'zhang daihao', null, null, null, null, null, null, null, 'zhangdaiscott@163.com', null, 'admin', TO_DATE('2019-01-19 15:39:04', 'YYYY-MM-DD HH24:MI:SS'), null, null, null); +INSERT INTO "DEMO" VALUES ('4981637bf71b0c1ed1365241dfcfa0ea', '小虎', null, null, null, null, '2', '28', null, null, null, 'scott', TO_DATE('2019-01-19 13:12:53', 'YYYY-MM-DD HH24:MI:SS'), 'qinfeng', TO_DATE('2019-01-19 13:13:12', 'YYYY-MM-DD HH24:MI:SS'), null); +INSERT INTO "DEMO" VALUES ('5c16e6a5c31296bcd3f1053d5d118815', '导入zhangdaiscott', null, null, null, null, '1', null, TO_DATE('2019-01-03 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, 'jeecg-boot', TO_DATE('2019-04-10 11:42:57', 'YYYY-MM-DD HH24:MI:SS'), null, null, null); +INSERT INTO "DEMO" VALUES ('7', 'zhangdaiscott', null, null, null, null, '1', null, TO_DATE('2019-01-03 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, null, null, null, null); +INSERT INTO "DEMO" VALUES ('73bc58611012617ca446d8999379e4ac', '郭靖11a', '777', TO_DATE('2018-12-07 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), null, null, null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 18:16:39', 'YYYY-MM-DD HH24:MI:SS'), null, null, null); +INSERT INTO "DEMO" VALUES ('917e240eaa0b1b2d198ae869b64a81c3', 'zhang daihao', null, null, null, null, '2', '0', TO_DATE('2018-11-29 00:00:00', 'YYYY-MM-DD HH24:MI:SS'), 'zhangdaiscott@163.com', null, null, null, null, null, null); +INSERT INTO "DEMO" VALUES ('94420c5d8fc4420dde1e7196154b3a24', '秦111', null, null, null, null, null, null, null, null, null, 'scott', TO_DATE('2019-01-19 12:54:58', 'YYYY-MM-DD HH24:MI:SS'), 'qinfeng', TO_DATE('2019-01-19 13:12:10', 'YYYY-MM-DD HH24:MI:SS'), null); +INSERT INTO "DEMO" VALUES ('95740656751c5f22e5932ab0ae33b1e4', '杨康22a', '奸臣', null, null, null, null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 18:16:39', 'YYYY-MM-DD HH24:MI:SS'), null, null, null); +INSERT INTO "DEMO" VALUES ('b86897900c770503771c7bb88e5d1e9b', 'scott1', '开源、很好、hello', null, null, null, '1', null, null, 'zhangdaiscott@163.com', null, 'scott', TO_DATE('2019-01-19 12:22:34', 'YYYY-MM-DD HH24:MI:SS'), null, null, null); +INSERT INTO "DEMO" VALUES ('c0b7c3de7c62a295ab715943de8a315d', '秦风555', null, null, null, null, null, null, null, null, null, 'admin', TO_DATE('2019-01-19 13:18:30', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-01-19 13:18:50', 'YYYY-MM-DD HH24:MI:SS'), null); +INSERT INTO "DEMO" VALUES ('c28fa8391ef81d6fabd8bd894a7615aa', '小麦', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, 'jeecg-boot', TO_DATE('2019-04-04 17:18:09', 'YYYY-MM-DD HH24:MI:SS'), null, null, null); +INSERT INTO "DEMO" VALUES ('c2c0d49e3c01913067cf8d1fb3c971d2', 'zhang daihao', null, null, null, null, '2', null, null, 'zhangdaiscott@163.com', null, 'admin', TO_DATE('2019-01-19 23:37:18', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-01-21 16:49:06', 'YYYY-MM-DD HH24:MI:SS'), null); +INSERT INTO "DEMO" VALUES ('c96279c666b4b82e3ef1e4e2978701ce', '报名时间', null, null, null, null, null, null, null, null, null, 'jeecg-boot', TO_DATE('2019-03-28 18:00:52', 'YYYY-MM-DD HH24:MI:SS'), null, null, null); +INSERT INTO "DEMO" VALUES ('d24668721446e8478eeeafe4db66dcff', 'zhang daihao999', null, null, null, null, '1', null, null, 'zhangdaiscott@163.com', null, null, null, null, null, null); +INSERT INTO "DEMO" VALUES ('eaa6c1116b41dc10a94eae34cf990133', 'zhang daihao', null, null, null, null, null, null, null, 'zhangdaiscott@163.com', null, null, null, null, null, null); +INSERT INTO "DEMO" VALUES ('ffa9da1ad40632dfcabac51d766865bd', '秦999', null, null, null, null, null, null, null, null, null, 'admin', TO_DATE('2019-01-19 23:36:34', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-14 17:30:43', 'YYYY-MM-DD HH24:MI:SS'), null); -- ---------------------------- @@ -3194,7 +3197,6 @@ INSERT INTO "SYS_PERMISSION" VALUES ('9502685863ab87f0ad1134142788a385', null, ' INSERT INTO "SYS_PERMISSION" VALUES ('97c8629abc7848eccdb6d77c24bb3ebb', '700b7f95165c46cc7a78bf227aa8fed3', '磁盘监控', '/monitor/Disk', 'modules/monitor/DiskMonitoring', null, null, '1', null, null, '6', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-25 14:30:06', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-05-05 14:37:14', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null); INSERT INTO "SYS_PERMISSION" VALUES ('9a90363f216a6a08f32eecb3f0bf12a3', '2a470fc0c3954d9dbb61de6d80846549', '常用选择组件', '/jeecg/SelectDemo', 'jeecg/SelectDemo', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-03-19 11:19:05', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-10 15:36:50', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null); INSERT INTO "SYS_PERMISSION" VALUES ('9cb91b8851db0cf7b19d7ecc2a8193dd', '1939e035e803a99ceecb6f5563570fb2', '我的任务表单', '/modules/bpm/task/form/FormModule', 'modules/bpm/task/form/FormModule', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-03-08 16:49:05', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-08 18:37:56', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null); -INSERT INTO "SYS_PERMISSION" VALUES ('a2b11669e98c5fe54a53c3e3c4f35d14', 'f0675b52d89100ee88472b6800754a08', '类别统计报表', '/report/Analysis', 'jeecg/report/Analysis', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-04-03 19:03:56', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-04-03 19:05:26', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null); INSERT INTO "SYS_PERMISSION" VALUES ('a400e4f4d54f79bf5ce160ae432231af', '2a470fc0c3954d9dbb61de6d80846549', '百度', 'http://www.baidu.com', 'layouts/IframePageView', null, null, '1', null, null, '4', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-01-29 19:44:06', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-02-15 16:25:02', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null); INSERT INTO "SYS_PERMISSION" VALUES ('ae4fed059f67086fd52a73d913cf473d', '540a2936940846cb98114ffb0d145cb8', '内联编辑表格', '/list/edit-table', 'list/TableInnerEditList', null, null, '1', null, null, '2', null, null, '1', '1', null, null, null, TO_DATE('2018-12-25 20:34:38', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0', '0', null); INSERT INTO "SYS_PERMISSION" VALUES ('aedbf679b5773c1f25e9f7b10111da73', '08e6b9dc3c04489c8e1ff2ce6f105aa4', 'SQL监控', '{{ window._CONFIG[''domianURL''] }}/druid/', 'layouts/IframePageView', null, null, '1', null, null, '1', '0', null, '1', '1', '0', null, 'admin', TO_DATE('2019-01-30 09:43:22', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-23 19:00:46', 'YYYY-MM-DD HH24:MI:SS'), '0', '0', null); diff --git a/jeecg-boot/db/jeecg-boot-sqlserver_2008.sql b/jeecg-boot/db/jeecg-boot-sqlserver_2008.sql index 8e84594..178b873 100644 --- a/jeecg-boot/db/jeecg-boot-sqlserver_2008.sql +++ b/jeecg-boot/db/jeecg-boot-sqlserver_2008.sql @@ -235,6 +235,7 @@ CREATE TABLE [dbo].[demo]( [create_time] [datetime2](7) NULL, [update_by] [nvarchar](32) NULL, [update_time] [datetime2](7) NULL, + [sys_org_code] [nvarchar](64) NULL, PRIMARY KEY CLUSTERED ( [id] ASC @@ -271,6 +272,8 @@ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改人' , @ GO EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'修改时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'update_time' GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'所属部门编码' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'demo', @level2type=N'COLUMN',@level2name=N'sys_org_code' +GO SET ANSI_NULLS ON GO SET QUOTED_IDENTIFIER ON @@ -1628,8 +1631,6 @@ GO - - INSERT [dbo].[jeecg_project_nature_income] ([id], [nature], [insurance_fee], [risk_consulting_fee], [evaluation_fee], [insurance_evaluation_fee], [bidding_consulting_fee], [interol_consulting_fee]) VALUES (1, N'市场化-电商业务', CAST(4865.41 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2))) INSERT [dbo].[jeecg_project_nature_income] ([id], [nature], [insurance_fee], [risk_consulting_fee], [evaluation_fee], [insurance_evaluation_fee], [bidding_consulting_fee], [interol_consulting_fee]) VALUES (2, N'统筹型', CAST(35767081.88 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2))) INSERT [dbo].[jeecg_project_nature_income] ([id], [nature], [insurance_fee], [risk_consulting_fee], [evaluation_fee], [insurance_evaluation_fee], [bidding_consulting_fee], [interol_consulting_fee]) VALUES (3, N'市场化-非股东', CAST(1487045.35 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2))) @@ -1798,28 +1799,28 @@ INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_incom INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (22, N'2019', N'10月', CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2))) INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (23, N'2019', N'11月', CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2))) INSERT [dbo].[jeecg_monthly_growth_analysis] ([id], [year], [month], [main_income], [other_income]) VALUES (24, N'2019', N'12月', CAST(0.00 AS Decimal(18, 2)), CAST(0.00 AS Decimal(18, 2))) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'08375a2dff80e821d5a158dd98302b23', N'导入小虎', NULL, NULL, NULL, NULL, N'2', 28, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078076733362863F0B AS DateTime2), NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1c2ba51b29a42d9de02bbd708ea8121a', N'777777', N'777', CAST(0x078078824DA50A3F0B AS DateTime2), NULL, NULL, NULL, 7, CAST(0x0A3F0B00 AS Date), NULL, NULL, NULL, NULL, N'admin', CAST(0x0700C606849A563F0B AS DateTime2)) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1dc29e80be14d1400f165b5c6b30c707', N'zhang daihao', NULL, NULL, NULL, NULL, N'2', NULL, NULL, N'zhangdaiscott@163.com', NULL, NULL, NULL, NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'304e651dc769d5c9b6e08fb30457a602', N'小白兔', NULL, NULL, NULL, NULL, N'2', 28, NULL, NULL, NULL, N'scott', CAST(0x0780B8B7C36E353F0B AS DateTime2), N'qinfeng', CAST(0x0700E40ACF6E353F0B AS DateTime2)) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4', N'Sandy', N'开源，很好', CAST(0x070000000000123F0B AS DateTime2), NULL, NULL, N'2', 21, CAST(0x123F0B00 AS Date), N'test4@baomidou.com', N'聪明00', NULL, NULL, N'admin', CAST(0x07804D7D398A5A3F0B AS DateTime2)) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'42c08b1a2e5b2a96ffa4cc88383d4b11', N'秦50090', NULL, CAST(0x07805FFE51AC273F0B AS DateTime2), NULL, NULL, NULL, 28, CAST(0x273F0B00 AS Date), NULL, NULL, N'admin', CAST(0x0700E5B35FAC353F0B AS DateTime2), N'admin', CAST(0x0780789074AC353F0B AS DateTime2)) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4436302a0de50bb83025286bc414d6a9', N'zhang daihao', NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'zhangdaiscott@163.com', NULL, N'admin', CAST(0x07001CA42F83353F0B AS DateTime2), NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'4981637bf71b0c1ed1365241dfcfa0ea', N'小虎', NULL, NULL, NULL, NULL, N'2', 28, NULL, NULL, NULL, N'scott', CAST(0x0780B8B7C36E353F0B AS DateTime2), N'qinfeng', CAST(0x0700E40ACF6E353F0B AS DateTime2)) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'5c16e6a5c31296bcd3f1053d5d118815', N'导入zhangdaiscott', NULL, NULL, NULL, NULL, N'1', NULL, CAST(0x253F0B00 AS Date), NULL, NULL, N'jeecg-boot', CAST(0x078076733362863F0B AS DateTime2), NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'7', N'zhangdaiscott', NULL, NULL, NULL, NULL, N'1', NULL, CAST(0x253F0B00 AS Date), NULL, NULL, NULL, NULL, NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'73bc58611012617ca446d8999379e4ac', N'郭靖11a', N'777', CAST(0x0700000000000A3F0B AS DateTime2), NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809D423399793F0B AS DateTime2), NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'917e240eaa0b1b2d198ae869b64a81c3', N'zhang daihao', NULL, NULL, NULL, NULL, N'2', 0, CAST(0x023F0B00 AS Date), N'zhangdaiscott@163.com', NULL, NULL, NULL, NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'94420c5d8fc4420dde1e7196154b3a24', N'秦111', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'scott', CAST(0x0700BDF7426C353F0B AS DateTime2), N'qinfeng', CAST(0x07007116AA6E353F0B AS DateTime2)) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'95740656751c5f22e5932ab0ae33b1e4', N'杨康22a', N'奸臣', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809D423399793F0B AS DateTime2), NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'b86897900c770503771c7bb88e5d1e9b', N'scott1', N'开源、很好、hello', NULL, NULL, NULL, N'1', NULL, NULL, N'zhangdaiscott@163.com', NULL, N'scott', CAST(0x0700E140BC67353F0B AS DateTime2), NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c0b7c3de7c62a295ab715943de8a315d', N'秦风555', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700D7958C6F353F0B AS DateTime2), N'admin', CAST(0x07009981986F353F0B AS DateTime2)) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c28fa8391ef81d6fabd8bd894a7615aa', N'小麦', NULL, NULL, NULL, NULL, N'2', NULL, NULL, N'zhangdaiscott@163.com', NULL, N'jeecg-boot', CAST(0x07801E230791803F0B AS DateTime2), NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c2c0d49e3c01913067cf8d1fb3c971d2', N'zhang daihao', NULL, NULL, NULL, NULL, N'2', NULL, NULL, N'zhangdaiscott@163.com', NULL, N'admin', CAST(0x07000B99FEC5353F0B AS DateTime2), N'admin', CAST(0x07006D3AF88C373F0B AS DateTime2)) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'c96279c666b4b82e3ef1e4e2978701ce', N'报名时间', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700E2CDFE96793F0B AS DateTime2), NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'd24668721446e8478eeeafe4db66dcff', N'zhang daihao999', NULL, NULL, NULL, NULL, N'1', NULL, NULL, N'zhangdaiscott@163.com', NULL, NULL, NULL, NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'eaa6c1116b41dc10a94eae34cf990133', N'zhang daihao', NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'zhangdaiscott@163.com', NULL, NULL, NULL, NULL, NULL) -INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time]) VALUES (N'ffa9da1ad40632dfcabac51d766865bd', N'秦999', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x07002D5FE4C5353F0B AS DateTime2), N'admin', CAST(0x0780638EC8924F3F0B AS DateTime2)) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'08375a2dff80e821d5a158dd98302b23', N'导入小虎', NULL, NULL, NULL, NULL, N'2', 28, NULL, NULL, NULL, N'jeecg-boot', CAST(0x078076733362863F0B AS DateTime2), NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'1c2ba51b29a42d9de02bbd708ea8121a', N'777777', N'777', CAST(0x078078824DA50A3F0B AS DateTime2), NULL, NULL, NULL, 7, CAST(0x0A3F0B00 AS Date), NULL, NULL, NULL, NULL, N'admin', CAST(0x0700C606849A563F0B AS DateTime2), NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'1dc29e80be14d1400f165b5c6b30c707', N'zhang daihao', NULL, NULL, NULL, NULL, N'2', NULL, NULL, N'zhangdaiscott@163.com', NULL, NULL, NULL, NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'304e651dc769d5c9b6e08fb30457a602', N'小白兔', NULL, NULL, NULL, NULL, N'2', 28, NULL, NULL, NULL, N'scott', CAST(0x0780B8B7C36E353F0B AS DateTime2), N'qinfeng', CAST(0x0700E40ACF6E353F0B AS DateTime2), NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'4', N'Sandy', N'开源，很好', CAST(0x070000000000123F0B AS DateTime2), NULL, NULL, N'2', 21, CAST(0x123F0B00 AS Date), N'test4@baomidou.com', N'聪明00', NULL, NULL, N'admin', CAST(0x07804D7D398A5A3F0B AS DateTime2), NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'42c08b1a2e5b2a96ffa4cc88383d4b11', N'秦50090', NULL, CAST(0x07805FFE51AC273F0B AS DateTime2), NULL, NULL, NULL, 28, CAST(0x273F0B00 AS Date), NULL, NULL, N'admin', CAST(0x0700E5B35FAC353F0B AS DateTime2), N'admin', CAST(0x0780789074AC353F0B AS DateTime2), NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'4436302a0de50bb83025286bc414d6a9', N'zhang daihao', NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'zhangdaiscott@163.com', NULL, N'admin', CAST(0x07001CA42F83353F0B AS DateTime2), NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'4981637bf71b0c1ed1365241dfcfa0ea', N'小虎', NULL, NULL, NULL, NULL, N'2', 28, NULL, NULL, NULL, N'scott', CAST(0x0780B8B7C36E353F0B AS DateTime2), N'qinfeng', CAST(0x0700E40ACF6E353F0B AS DateTime2), NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'5c16e6a5c31296bcd3f1053d5d118815', N'导入zhangdaiscott', NULL, NULL, NULL, NULL, N'1', NULL, CAST(0x253F0B00 AS Date), NULL, NULL, N'jeecg-boot', CAST(0x078076733362863F0B AS DateTime2), NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'7', N'zhangdaiscott', NULL, NULL, NULL, NULL, N'1', NULL, CAST(0x253F0B00 AS Date), NULL, NULL, NULL, NULL, NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'73bc58611012617ca446d8999379e4ac', N'郭靖11a', N'777', CAST(0x0700000000000A3F0B AS DateTime2), NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809D423399793F0B AS DateTime2), NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'917e240eaa0b1b2d198ae869b64a81c3', N'zhang daihao', NULL, NULL, NULL, NULL, N'2', 0, CAST(0x023F0B00 AS Date), N'zhangdaiscott@163.com', NULL, NULL, NULL, NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'94420c5d8fc4420dde1e7196154b3a24', N'秦111', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'scott', CAST(0x0700BDF7426C353F0B AS DateTime2), N'qinfeng', CAST(0x07007116AA6E353F0B AS DateTime2), NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'95740656751c5f22e5932ab0ae33b1e4', N'杨康22a', N'奸臣', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x07809D423399793F0B AS DateTime2), NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'b86897900c770503771c7bb88e5d1e9b', N'scott1', N'开源、很好、hello', NULL, NULL, NULL, N'1', NULL, NULL, N'zhangdaiscott@163.com', NULL, N'scott', CAST(0x0700E140BC67353F0B AS DateTime2), NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'c0b7c3de7c62a295ab715943de8a315d', N'秦风555', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x0700D7958C6F353F0B AS DateTime2), N'admin', CAST(0x07009981986F353F0B AS DateTime2), NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'c28fa8391ef81d6fabd8bd894a7615aa', N'小麦', NULL, NULL, NULL, NULL, N'2', NULL, NULL, N'zhangdaiscott@163.com', NULL, N'jeecg-boot', CAST(0x07801E230791803F0B AS DateTime2), NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'c2c0d49e3c01913067cf8d1fb3c971d2', N'zhang daihao', NULL, NULL, NULL, NULL, N'2', NULL, NULL, N'zhangdaiscott@163.com', NULL, N'admin', CAST(0x07000B99FEC5353F0B AS DateTime2), N'admin', CAST(0x07006D3AF88C373F0B AS DateTime2), NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'c96279c666b4b82e3ef1e4e2978701ce', N'报名时间', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'jeecg-boot', CAST(0x0700E2CDFE96793F0B AS DateTime2), NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'd24668721446e8478eeeafe4db66dcff', N'zhang daihao999', NULL, NULL, NULL, NULL, N'1', NULL, NULL, N'zhangdaiscott@163.com', NULL, NULL, NULL, NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'eaa6c1116b41dc10a94eae34cf990133', N'zhang daihao', NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'zhangdaiscott@163.com', NULL, NULL, NULL, NULL, NULL, NULL) +INSERT [dbo].[demo] ([id], [name], [key_word], [punch_time], [salary_money], [bonus_money], [sex], [age], [birthday], [email], [content], [create_by], [create_time], [update_by], [update_time], [sys_org_code]) VALUES (N'ffa9da1ad40632dfcabac51d766865bd', N'秦999', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, N'admin', CAST(0x07002D5FE4C5353F0B AS DateTime2), N'admin', CAST(0x0780638EC8924F3F0B AS DateTime2), NULL) INSERT [dbo].[QRTZ_LOCKS] ([SCHED_NAME], [LOCK_NAME]) VALUES (N'quartzScheduler', N'TRIGGER_ACCESS') INSERT [dbo].[test_person] ([id], [create_by], [create_time], [update_by], [update_time], [sex], [name], [content], [be_date], [qj_days]) VALUES (N'8ca668defdae47df8649a5477ae08b05', N'admin', CAST(0x07805ADCA552883F0B AS DateTime2), NULL, NULL, N'1', N'zhangdaiscott', N'dsdsd', CAST(0x070000000000883F0B AS DateTime2), 2) INSERT [dbo].[sys_user_role] ([id], [user_id], [role_id]) VALUES (N'b3ffd9311a1ca296c44e2409b547384f', N'01b802058ea94b978a2c96f4807f6b48', N'1') @@ -2305,7 +2306,6 @@ INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [c INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'97c8629abc7848eccdb6d77c24bb3ebb', N'700b7f95165c46cc7a78bf227aa8fed3', N'磁盘监控', N'/monitor/Disk', N'modules/monitor/DiskMonitoring', NULL, NULL, 1, NULL, NULL, 6, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07006B338D79953F0B AS DateTime2), N'admin', CAST(0x0700094F8C7A9F3F0B AS DateTime2), 0, 0, NULL) INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'9a90363f216a6a08f32eecb3f0bf12a3', N'2a470fc0c3954d9dbb61de6d80846549', N'常用选择组件', N'/jeecg/SelectDemo', N'jeecg/SelectDemo', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x07809AE9DD5E703F0B AS DateTime2), N'admin', CAST(0x070055C5DF82863F0B AS DateTime2), 0, 0, NULL) INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'9cb91b8851db0cf7b19d7ecc2a8193dd', N'1939e035e803a99ceecb6f5563570fb2', N'我的任务表单', N'/modules/bpm/task/form/FormModule', N'modules/bpm/task/form/FormModule', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0780D6A1F78C653F0B AS DateTime2), N'admin', CAST(0x07005A692C9C653F0B AS DateTime2), 0, 0, NULL) -INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'a2b11669e98c5fe54a53c3e3c4f35d14', N'f0675b52d89100ee88472b6800754a08', N'类别统计报表', N'/report/Analysis', N'jeecg/report/Analysis', NULL, N'', 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x0700763ECE9F7F3F0B AS DateTime2), N'admin', CAST(0x07005FE303A07F3F0B AS DateTime2), 0, 0, NULL) INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'a400e4f4d54f79bf5ce160ae432231af', N'2a470fc0c3954d9dbb61de6d80846549', N'百度', N'http://www.baidu.com', N'layouts/IframePageView', NULL, NULL, 1, NULL, NULL, 4, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x070047B76AA53F3F0B AS DateTime2), N'admin', CAST(0x070083899B89503F0B AS DateTime2), 0, 0, NULL) INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'ae4fed059f67086fd52a73d913cf473d', N'540a2936940846cb98114ffb0d145cb8', N'内联编辑表格', N'/list/edit-table', N'list/TableInnerEditList', NULL, NULL, 1, NULL, NULL, 2, NULL, NULL, 1, 1, NULL, NULL, NULL, CAST(0x0700C3ED79AC1C3F0B AS DateTime2), NULL, NULL, 0, 0, NULL) INSERT [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [hidden], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status]) VALUES (N'aedbf679b5773c1f25e9f7b10111da73', N'08e6b9dc3c04489c8e1ff2ce6f105aa4', N'SQL监控', N'{{ window._CONFIG[''domianURL''] }}/druid/', N'layouts/IframePageView', NULL, NULL, 1, NULL, NULL, 1, 0, NULL, 1, 1, 0, NULL, N'admin', CAST(0x070059D17E51403F0B AS DateTime2), N'admin', CAST(0x0700C3FE5C9F743F0B AS DateTime2), 0, 0, NULL) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index 47ff8df..2f8a3ee 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -13,8 +13,6 @@ import java.util.UUID; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.apache.shiro.authz.annotation.RequiresRoles; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.PasswordUtil; @@ -24,7 +22,6 @@ import org.jeecg.modules.system.entity.SysUserDepart; import org.jeecg.modules.system.entity.SysUserRole; import org.jeecg.modules.system.model.DepartIdModel; import org.jeecg.modules.system.model.SysUserDepartsVO; -import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.system.service.ISysUserDepartService; import org.jeecg.modules.system.service.ISysUserRoleService; import org.jeecg.modules.system.service.ISysUserService; @@ -71,9 +68,6 @@ public class SysUserController { @Autowired private ISysUserService sysUserService; - @Autowired - private ISysDepartService sysDepartService; - @Autowired private ISysUserRoleService sysUserRoleService; @@ -96,7 +90,6 @@ public class SysUserController { } @RequestMapping(value = "/add", method = RequestMethod.POST) - @RequiresPermissions("user:add") public Result add(@RequestBody JSONObject jsonObject) { Result result = new Result(); String selectedRoles = jsonObject.getString("selectedroles"); @@ -119,7 +112,6 @@ public class SysUserController { } @RequestMapping(value = "/edit", method = RequestMethod.PUT) - @RequiresPermissions("user:edit") public Result edit(@RequestBody JSONObject jsonObject) { Result result = new Result(); try { @@ -145,7 +137,6 @@ public class SysUserController { /** * 删除用户 */ - @RequiresRoles({"admin"}) @RequestMapping(value = "/delete", method = RequestMethod.DELETE) public Result delete(@RequestParam(name="id",required=true) String id) { Result result = new Result(); @@ -170,7 +161,6 @@ public class SysUserController { /** * 批量删除用户 */ - @RequiresRoles({"admin"}) @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { // 定义SysUserDepart实体类的数据库查询对象LambdaQueryWrapper @@ -196,7 +186,6 @@ public class SysUserController { * @param jsonObject * @return */ - @RequiresRoles({"admin"}) @RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT) public Result frozenBatch(@RequestBody JSONObject jsonObject) { Result result = new Result(); @@ -300,7 +289,6 @@ public class SysUserController { /** * 修改密码 */ - @RequiresRoles({"admin"}) @RequestMapping(value = "/changPassword", method = RequestMethod.PUT) public Result changPassword(@RequestBody SysUser sysUser) { Result result = new Result(); @@ -475,7 +463,6 @@ public class SysUserController { * @return */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - @RequiresPermissions("user:import") public Result importExcel(HttpServletRequest request, HttpServletResponse response) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); @@ -528,7 +515,6 @@ public class SysUserController { /** * 首页密码修改 */ - @RequiresRoles({"admin"}) @RequestMapping(value = "/updatePassword", method = RequestMethod.PUT) public Result changPassword(@RequestBody JSONObject json) { Result result = new Result(); -- GitLab