liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!163 BUG 修复 

Merge pull request !163 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-07-25 01:08:21 +00:00 committed by Gitee
parent 3e92e25520 b44539f62f
commit 5ccb12569a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
11 changed files with 55 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
docs/初始数据SQL/浏览按钮.sql
View File

@ -1,59 +1,20 @@
INSERT INTO datashowset(`id`, `SHOWNAME`, `SHOWCLASS`, `DATAFROM`, `DATASOURCEID`, `SQLTEXT`, `WSURL`, `WSOPERATION`, `XMLTEXT`, `INPARA`, `SHOWTYPE`, `KEYFIELD`, `PARENTFIELD`, `SHOWFIELD`, `DETAILPAGEURL`, `TYPENAME`, `SELECTTYPE`, `SHOWPAGEURL`, `BROWSERFROM`, `NAME`, `CUSTOMID`, `CUSTOMHREF`, `SQLTEXT1`, `SQLTEXT2`, `NAMEHEADER`, `DESCRIPTIONHEADER`, `WSWORKNAME`, `SEARCHBYID`, `CREATEDATE`, `CREATETIME`, `MODIFYDATE`, `MODIFYTIME`, `SEARCHBYNAME`, `onlylowestnode`, `characterset`, `uuid`, `isSupportPaging`, `ESBID`, `ESBSHOWID`, `mobiledetailpageurl`, `isPhyPage`, `subcompanyid`, `unconditionalQuery`) VALUES (7, 'schemeBrowser', '1', '1', '', 'select id,scheme_no ,scheme_name ,scheme_description from jcl_org_scheme where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '等级方案浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-11', '13:54:29', '2022-05-11', '14:34:38', '', '', '0', 'd2482569-d0ee-11ec-a80d-0250f2000002', '', '', '', '', '1', 0, 1);
INSERT INTO datashowset(`id`, `SHOWNAME`, `SHOWCLASS`, `DATAFROM`, `DATASOURCEID`, `SQLTEXT`, `WSURL`, `WSOPERATION`, `XMLTEXT`, `INPARA`, `SHOWTYPE`, `KEYFIELD`, `PARENTFIELD`, `SHOWFIELD`, `DETAILPAGEURL`, `TYPENAME`, `SELECTTYPE`, `SHOWPAGEURL`, `BROWSERFROM`, `NAME`, `CUSTOMID`, `CUSTOMHREF`, `SQLTEXT1`, `SQLTEXT2`, `NAMEHEADER`, `DESCRIPTIONHEADER`, `WSWORKNAME`, `SEARCHBYID`, `CREATEDATE`, `CREATETIME`, `MODIFYDATE`, `MODIFYTIME`, `SEARCHBYNAME`, `onlylowestnode`, `characterset`, `uuid`, `isSupportPaging`, `ESBID`, `ESBSHOWID`, `mobiledetailpageurl`, `isPhyPage`, `subcompanyid`, `unconditionalQuery`) VALUES (8, 'LevelBrowser', '1', '1', '', 'select id,level_no ,level_name ,description ,scheme_id from jcl_org_level where delete_type =\'0\' and forbidden_tag =\'0\' and (scheme_id =$scheme_id$ or id in ($level_id$))', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职等浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-12', '10:44:12', '2022-07-12', '10:45:23', '', '', '0', '6847333b-d19d-11ec-9deb-0250f2000002', '', '', '', '', '1', 0, 1);
INSERT INTO datashowset(`id`, `SHOWNAME`, `SHOWCLASS`, `DATAFROM`, `DATASOURCEID`, `SQLTEXT`, `WSURL`, `WSOPERATION`, `XMLTEXT`, `INPARA`, `SHOWTYPE`, `KEYFIELD`, `PARENTFIELD`, `SHOWFIELD`, `DETAILPAGEURL`, `TYPENAME`, `SELECTTYPE`, `SHOWPAGEURL`, `BROWSERFROM`, `NAME`, `CUSTOMID`, `CUSTOMHREF`, `SQLTEXT1`, `SQLTEXT2`, `NAMEHEADER`, `DESCRIPTIONHEADER`, `WSWORKNAME`, `SEARCHBYID`, `CREATEDATE`, `CREATETIME`, `MODIFYDATE`, `MODIFYTIME`, `SEARCHBYNAME`, `onlylowestnode`, `characterset`, `uuid`, `isSupportPaging`, `ESBID`, `ESBSHOWID`, `mobiledetailpageurl`, `isPhyPage`, `subcompanyid`, `unconditionalQuery`) VALUES (9, 'postBrowser', '1', '1', '', 'select id,post_name ,description from jcl_org_post jop where delete_type =\'0\'', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职务分类浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-16', '11:01:30', '2022-07-04', '14:52:14', '', '', '0', '7a1fed8a-d4c4-11ec-9deb-0250f2000002', '', '', '', '', '1', 0, 1);
INSERT INTO datashowset(`id`, `SHOWNAME`, `SHOWCLASS`, `DATAFROM`, `DATASOURCEID`, `SQLTEXT`, `WSURL`, `WSOPERATION`, `XMLTEXT`, `INPARA`, `SHOWTYPE`, `KEYFIELD`, `PARENTFIELD`, `SHOWFIELD`, `DETAILPAGEURL`, `TYPENAME`, `SELECTTYPE`, `SHOWPAGEURL`, `BROWSERFROM`, `NAME`, `CUSTOMID`, `CUSTOMHREF`, `SQLTEXT1`, `SQLTEXT2`, `NAMEHEADER`, `DESCRIPTIONHEADER`, `WSWORKNAME`, `SEARCHBYID`, `CREATEDATE`, `CREATETIME`, `MODIFYDATE`, `MODIFYTIME`, `SEARCHBYNAME`, `onlylowestnode`, `characterset`, `uuid`, `isSupportPaging`, `ESBID`, `ESBSHOWID`, `mobiledetailpageurl`, `isPhyPage`, `subcompanyid`, `unconditionalQuery`) VALUES (10, 'compBrowser', '1', '1', '', 'select * from jcl_org_comp where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '2', 'id', 'parent_company', 'comp_name', '', '', '', '', 2, '公司分部浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-24', '14:49:23', '2022-05-24', '14:49:23', '', '', '0', 'a4b135d2-db2d-11ec-9deb-0250f2000002', '', '', '', '', '2', 0, 1);
INSERT INTO datashowset(`id`, `SHOWNAME`, `SHOWCLASS`, `DATAFROM`, `DATASOURCEID`, `SQLTEXT`, `WSURL`, `WSOPERATION`, `XMLTEXT`, `INPARA`, `SHOWTYPE`, `KEYFIELD`, `PARENTFIELD`, `SHOWFIELD`, `DETAILPAGEURL`, `TYPENAME`, `SELECTTYPE`, `SHOWPAGEURL`, `BROWSERFROM`, `NAME`, `CUSTOMID`, `CUSTOMHREF`, `SQLTEXT1`, `SQLTEXT2`, `NAMEHEADER`, `DESCRIPTIONHEADER`, `WSWORKNAME`, `SEARCHBYID`, `CREATEDATE`, `CREATETIME`, `MODIFYDATE`, `MODIFYTIME`, `SEARCHBYNAME`, `onlylowestnode`, `characterset`, `uuid`, `isSupportPaging`, `ESBID`, `ESBSHOWID`, `mobiledetailpageurl`, `isPhyPage`, `subcompanyid`, `unconditionalQuery`) VALUES (21, 'deptBrowser', '1', '1', '', 'select * from jcl_org_dept where delete_type = 0 and forbidden_tag = 0 ', '', '', '', '', '2', 'id', 'parent_dept', 'dept_name', '', '', '', '', 2, '部门浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-31', '10:07:35', '2022-06-23', '19:01:47', '', '', '0', '706261ca-e086-11ec-b2c8-00e04c680716', '', '', '', '', '2', 0, 1);
INSERT INTO datashowset(`id`, `SHOWNAME`, `SHOWCLASS`, `DATAFROM`, `DATASOURCEID`, `SQLTEXT`, `WSURL`, `WSOPERATION`, `XMLTEXT`, `INPARA`, `SHOWTYPE`, `KEYFIELD`, `PARENTFIELD`, `SHOWFIELD`, `DETAILPAGEURL`, `TYPENAME`, `SELECTTYPE`, `SHOWPAGEURL`, `BROWSERFROM`, `NAME`, `CUSTOMID`, `CUSTOMHREF`, `SQLTEXT1`, `SQLTEXT2`, `NAMEHEADER`, `DESCRIPTIONHEADER`, `WSWORKNAME`, `SEARCHBYID`, `CREATEDATE`, `CREATETIME`, `MODIFYDATE`, `MODIFYTIME`, `SEARCHBYNAME`, `onlylowestnode`, `characterset`, `uuid`, `isSupportPaging`, `ESBID`, `ESBSHOWID`, `mobiledetailpageurl`, `isPhyPage`, `subcompanyid`, `unconditionalQuery`) VALUES (22, 'sequenceBrowser', '1', '1', '', 'select *,scheme_id as scheme_value from jcl_org_sequence where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '岗位序列', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-31', '10:19:57', '2022-07-05', '13:33:40', '', '', '0', '2a80b572-e088-11ec-b2c8-00e04c680716', '', '', '', '', '1', 0, 1);
INSERT INTO datashowset(`id`, `SHOWNAME`, `SHOWCLASS`, `DATAFROM`, `DATASOURCEID`, `SQLTEXT`, `WSURL`, `WSOPERATION`, `XMLTEXT`, `INPARA`, `SHOWTYPE`, `KEYFIELD`, `PARENTFIELD`, `SHOWFIELD`, `DETAILPAGEURL`, `TYPENAME`, `SELECTTYPE`, `SHOWPAGEURL`, `BROWSERFROM`, `NAME`, `CUSTOMID`, `CUSTOMHREF`, `SQLTEXT1`, `SQLTEXT2`, `NAMEHEADER`, `DESCRIPTIONHEADER`, `WSWORKNAME`, `SEARCHBYID`, `CREATEDATE`, `CREATETIME`, `MODIFYDATE`, `MODIFYTIME`, `SEARCHBYNAME`, `onlylowestnode`, `characterset`, `uuid`, `isSupportPaging`, `ESBID`, `ESBSHOWID`, `mobiledetailpageurl`, `isPhyPage`, `subcompanyid`, `unconditionalQuery`) VALUES (23, 'jobBrowser', '1', '1', '', 'select * from jcl_org_job where delete_type = 0 and forbidden_tag = 0', '', '', '', '', '2', 'id', 'parent_job', 'job_name', '', '', '', '', 2, '岗位浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-05-31', '14:16:19', '2022-05-31', '14:16:19', '', '', '0', '2f9aecda-e0a9-11ec-b3da-149cd6593b1d', '', '', '', '', '2', 0, 1);
INSERT INTO datashowset(`id`, `SHOWNAME`, `SHOWCLASS`, `DATAFROM`, `DATASOURCEID`, `SQLTEXT`, `WSURL`, `WSOPERATION`, `XMLTEXT`, `INPARA`, `SHOWTYPE`, `KEYFIELD`, `PARENTFIELD`, `SHOWFIELD`, `DETAILPAGEURL`, `TYPENAME`, `SELECTTYPE`, `SHOWPAGEURL`, `BROWSERFROM`, `NAME`, `CUSTOMID`, `CUSTOMHREF`, `SQLTEXT1`, `SQLTEXT2`, `NAMEHEADER`, `DESCRIPTIONHEADER`, `WSWORKNAME`, `SEARCHBYID`, `CREATEDATE`, `CREATETIME`, `MODIFYDATE`, `MODIFYTIME`, `SEARCHBYNAME`, `onlylowestnode`, `characterset`, `uuid`, `isSupportPaging`, `ESBID`, `ESBSHOWID`, `mobiledetailpageurl`, `isPhyPage`, `subcompanyid`, `unconditionalQuery`) VALUES (24, 'staffPlanBrowser', '1', '1', '', 'select * from jcl_org_staffplan', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '编制方案浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-06-07', '09:57:42', '2022-06-07', '09:57:42', '', '', '0', '37ec08ea-e605-11ec-b4aa-f5a55dde45bb', '', '', '', '', '1', 0, 1);
INSERT INTO datashowset(`id`, `SHOWNAME`, `SHOWCLASS`, `DATAFROM`, `DATASOURCEID`, `SQLTEXT`, `WSURL`, `WSOPERATION`, `XMLTEXT`, `INPARA`, `SHOWTYPE`, `KEYFIELD`, `PARENTFIELD`, `SHOWFIELD`, `DETAILPAGEURL`, `TYPENAME`, `SELECTTYPE`, `SHOWPAGEURL`, `BROWSERFROM`, `NAME`, `CUSTOMID`, `CUSTOMHREF`, `SQLTEXT1`, `SQLTEXT2`, `NAMEHEADER`, `DESCRIPTIONHEADER`, `WSWORKNAME`, `SEARCHBYID`, `CREATEDATE`, `CREATETIME`, `MODIFYDATE`, `MODIFYTIME`, `SEARCHBYNAME`, `onlylowestnode`, `characterset`, `uuid`, `isSupportPaging`, `ESBID`, `ESBSHOWID`, `mobiledetailpageurl`, `isPhyPage`, `subcompanyid`, `unconditionalQuery`) VALUES (25, 'deptBrowserPrepare', '1', '1', '', 'select * from jcl_org_dept where delete_type = 0 and forbidden_tag = 0 and parent_comp = $parentComp$', '', '', '', '', '2', 'id', 'parent_dept', 'dept_name', '', '', '', '', 2, '部门浏览', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-06-24', '16:15:59', '2022-06-24', '16:15:59', '', '', '0', 'e12dac18-f395-11ec-a489-fc7142f7116e', '', '', '', '', '2', 0, 1);
INSERT INTO datashowset(`id`, `SHOWNAME`, `SHOWCLASS`, `DATAFROM`, `DATASOURCEID`, `SQLTEXT`, `WSURL`, `WSOPERATION`, `XMLTEXT`, `INPARA`, `SHOWTYPE`, `KEYFIELD`, `PARENTFIELD`, `SHOWFIELD`, `DETAILPAGEURL`, `TYPENAME`, `SELECTTYPE`, `SHOWPAGEURL`, `BROWSERFROM`, `NAME`, `CUSTOMID`, `CUSTOMHREF`, `SQLTEXT1`, `SQLTEXT2`, `NAMEHEADER`, `DESCRIPTIONHEADER`, `WSWORKNAME`, `SEARCHBYID`, `CREATEDATE`, `CREATETIME`, `MODIFYDATE`, `MODIFYTIME`, `SEARCHBYNAME`, `onlylowestnode`, `characterset`, `uuid`, `isSupportPaging`, `ESBID`, `ESBSHOWID`, `mobiledetailpageurl`, `isPhyPage`, `subcompanyid`, `unconditionalQuery`) VALUES (26, 'gradeBrowser', '1', '1', '', 'select * from jcl_org_grade where delete_type = 0 and forbidden_tag = 0 and scheme_id = $scheme_id$', '', '', '', '', '1', 'id', '', '', '', '', '', '', 2, '职级浏览按钮', NULL, '', NULL, NULL, NULL, NULL, '', '', '2022-07-07', '14:10:39', '2022-07-12', '14:13:03', '', '', '0', '86756cc2-fdbb-11ec-9a53-e9994385d085', '', '', '', '', '1', 0, 1);
INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (3, 'schemeBrowser', '0', 0, '2022-05-11', '13:54:29', '2022-05-11', '13:54:29');
INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (4, 'LevelBrowser', '0', 0, '2022-05-12', '10:44:13', '2022-05-12', '10:44:13');
INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (5, 'postBrowser', '0', 0, '2022-05-16', '11:01:31', '2022-05-16', '11:01:31');
INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (6, 'compBrowser', '0', 0, '2022-05-24', '14:49:23', '2022-05-24', '14:49:23');
INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (18, 'deptBrowser', '0', 0, '2022-05-31', '10:07:35', '2022-05-31', '10:07:35');
INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (19, 'sequenceBrowser', '0', 0, '2022-05-31', '10:19:57', '2022-05-31', '10:19:57');
INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (20, 'jobBrowser', '0', 0, '2022-05-31', '14:16:19', '2022-05-31', '14:16:19');
INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (21, 'staffPlanBrowser', '0', 0, '2022-06-07', '09:57:42', '2022-06-07', '09:57:42');
INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (22, 'deptBrowserPrepare', '0', 0, '2022-06-24', '16:15:59', '2022-06-24', '16:15:59');
INSERT INTO datashowcacheset(`id`, `showname`, `subcompanyid`, `isopencache`, `Createdate`, `createtime`, `Updatedate`, `Updatetime`) VALUES (23, 'gradeBrowser', '0', 0, '2022-07-07', '14:10:39', '2022-07-07', '14:10:39');
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (11, 7, '编号', 'scheme_no', '', 0, 1, '6ecae811d0f411eca80d0250f2000002', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (12, 7, '方案名称', 'scheme_name', '', 1, 2, '6ecec9f8d0f411eca80d0250f2000002', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (13, 7, '方案说明', 'scheme_description', '', 0, 3, '6f1143f3d0f411eca80d0250f2000002', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (197, 24, '编号', 'plan_no', '', 0, 1, '3809e856e60511ecb4aaf5a55dde45bb', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (198, 24, '名称', 'plan_name', '', 1, 2, '380ed1e0e60511ecb4aaf5a55dde45bb', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (199, 24, '年度', 'plan_year', '', 0, 3, '3812cb06e60511ecb4aaf5a55dde45bb', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (203, 9, '名称', 'post_name', '', 1, 1, 'd64afc56fb6511ec9a53e9994385d085', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (204, 9, '说明', 'description', '', 0, 2, 'd64c9868fb6511ec9a53e9994385d085', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (222, 22, '编号', 'sequence_no', '', 0, 1, '069c8186fc2411ec9a53e9994385d085', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (223, 22, '名称', 'sequence_name', '', 1, 2, '069d77b2fc2411ec9a53e9994385d085', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (224, 22, '等级方案', 'scheme_id', 'select scheme_name from jcl_org_scheme where id={?currentvalue}', 0, 3, '069e4034fc2411ec9a53e9994385d085', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (225, 22, '等级方案id', 'scheme_value', '', 0, 4, '069f1e82fc2411ec9a53e9994385d085', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (318, 8, '编号', 'level_no', '', 0, 1, 'ad54942e018c11edbe41ea108fa1766c', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (319, 8, '名称', 'level_name', '', 1, 2, 'ad5630ea018c11edbe41ea108fa1766c', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (320, 8, '描述说明', 'description', '', 0, 3, 'ad5766a4018c11edbe41ea108fa1766c', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (330, 26, '编号', 'grade_no', '', 0, 1, 'affb0dee01a911edbe41ea108fa1766c', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (331, 26, '名称', 'grade_name', '', 1, 2, 'affed2da01a911edbe41ea108fa1766c', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (332, 26, '描述方案', 'description', '', 0, 3, 'b000b80201a911edbe41ea108fa1766c', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (333, 26, '等级方案', 'scheme_id', 'select scheme_name from jcl_org_scheme where id={?currentvalue}', 0, 4, 'b0019d8001a911edbe41ea108fa1766c', NULL);
INSERT INTO datashowparam(`id`, `MAINID`, `FIELDNAME`, `SEARCHNAME`, `TRANSQL`, `ISSHOWNAME`, `dsporder`, `uuid`, `width`) VALUES (334, 26, '职等', 'level_id', 'select group_concat(level_name) from jcl_org_level where id in ( {?currentvalue})', 0, 5, 'b002478001a911edbe41ea108fa1766c', NULL);
insert into WF_BROWSER_CONFIG(type,clazz,description,titelebel)
values('666','com.api.browser.service.impl.JobBrowserService','聚才林岗位管理',-81474);
values('666','com.api.browser.service.impl.JobBrowserService','聚才林岗位管理',538781);
INSERT INTO WORKFLOW_BROWSERURL
( ID, LABELID, FIELDDBTYPE, BROWSERURL, TABLENAME, COLUMNAME,
KEYCOLUMNAME, LINKURL, TYPEID, USEABLE, ORDERID )
VALUES
( '666', '-81474', 'varchar(4000)',
( '666', '538781', 'varchar(4000)',
'/systeminfo/BrowserMain.jsp?url=',
'jcl_org_job', 'job_name', 'id', '/spa/organization/static/index.html#/main/organization/jobExtend/:id', '8', '1', '0' );

1
docs/表结构SQL/MySQL.sql
View File

@ -255,6 +255,7 @@ CREATE TABLE JCL_ORG_JOB (
work_duty text null,
work_authority text null,
forbidden_tag int NULL,
show_order int null,
is_used int null,
creator int null,
delete_type int null,

1
docs/表结构SQL/Oracle.sql
View File

@ -257,6 +257,7 @@ CREATE TABLE JCL_ORG_JOB (
WORK_DUTY NVARCHAR2(1000) NULL,
WORK_AUTHORITY NVARCHAR2(1000) NULL,
FORBIDDEN_TAG NUMBER NULL,
SHOW_ORDER NUMBER NULL,
IS_USED NUMBER NULL,
CREATOR NUMBER NULL,
DELETE_TYPE NUMBER NULL,

33
docs/表结构SQL/SqlServer.sql
View File

@ -255,6 +255,7 @@ CREATE TABLE JCL_ORG_JOB (
work_duty text null,
work_authority text null,
forbidden_tag int NULL,
show_order int null,
is_used int null,
creator int null,
delete_type int null,
@ -483,4 +484,36 @@ create table JCL_ORG_HRMRELATION (
create_time datetime null,
update_time datetime null,
constraint JCL_ORG_HRMRELATION_PK primary key (id)
);
-- JCL_ORG_MAP
CREATE TABLE JCL_ORG_MAP (
id int IDENTITY(1,1) NOT NULL,
ftype int NULL,
fobjid int NULL,
fecid int NULL,
Uuid varchar(100) NULL,
fclass int NULL,
fclassname varchar(100) NULL,
fnumber varchar(100) NULL,
fname varchar(255) NULL,
fleader int NULL,
fleaderimg int NULL,
fleadername varchar(100) NULL,
fleaderjobid int NULL,
fleaderjob varchar(255) NULL,
fleaderlv varchar(100) NULL,
fleaderst varchar(100) NULL,
fparentid int null,
fobjparentid int null,
fplan int null,
fonjob int null,
fisvitual int null,
fdatebegin date null,
fdateend date null,
creator int null,
delete_type int null,
create_time date null,
update_time date null,
CONSTRAINT JCL_ORG_MAP_PK PRIMARY KEY (id)
);

4
src/com/api/browser/service/impl/JobBrowserService.java
View File

@ -119,11 +119,11 @@ public class JobBrowserService extends BrowserService {
sqlWhere += " AND t.job_name " + dbType.like(jobName);
}
String ecCompany = Util.null2String(params.get("ecCompany"));
if (StringUtils.isNotBlank(jobName)) {
if (StringUtils.isNotBlank(ecCompany)) {
sqlWhere += " AND t.ec_company = '" + Long.parseLong(ecCompany) + "'";
}
String ecDepartment = Util.null2String(params.get("ecDepartment"));
if (StringUtils.isNotBlank(jobName)) {
if (StringUtils.isNotBlank(ecDepartment)) {
sqlWhere += " AND t.ec_department = '" + Long.parseLong(ecDepartment) + "'";
}
String treeKey = Util.null2String(params.get("treeKey"));

2
src/com/engine/organization/mapper/comp/CompMapper.java
View File

@ -149,7 +149,7 @@ public interface CompMapper {
*
* @return
*/
int getMaxShowOrder();
Integer getMaxShowOrder();
/**
* 根据名称和上级查找ID

2
src/com/engine/organization/mapper/department/DepartmentMapper.java
View File

@ -121,7 +121,7 @@ public interface DepartmentMapper {
*
* @return
*/
int getMaxShowOrder();
Integer getMaxShowOrder();
/**
* 根据名称、上级 查询部门元素

2
src/com/engine/organization/mapper/job/JobMapper.java
View File

@ -141,7 +141,7 @@ public interface JobMapper {
*
* @return
*/
int getMaxShowOrder();
Integer getMaxShowOrder();
/**
* 根据名字和上级查询岗位信息

5
src/com/engine/organization/service/impl/CompServiceImpl.java
View File

@ -145,7 +145,10 @@ public class CompServiceImpl extends Service implements CompService {
compNo = repeatDetermine(compNo);
params.put("comp_no", compNo);
if (null == params.get("show_order") || StringUtils.isBlank(params.get("show_order").toString())) {
int maxShowOrder = getCompMapper().getMaxShowOrder();
Integer maxShowOrder = getCompMapper().getMaxShowOrder();
if (null == maxShowOrder) {
maxShowOrder = 0;
}
params.put("show_order", maxShowOrder + 1);
}
Long id = getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_COMP, params, "", null);

5
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
View File

@ -196,7 +196,10 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
deptNo = repeatDetermine(deptNo);
params.put("dept_no", deptNo);
if (StringUtils.isBlank(Util.null2String(params.get("show_order")))) {
int maxShowOrder = getDepartmentMapper().getMaxShowOrder();
Integer maxShowOrder = getDepartmentMapper().getMaxShowOrder();
if (null == maxShowOrder) {
maxShowOrder = 0;
}
params.put("show_order", maxShowOrder + 1);
}
Long departmentId = getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_DEPT, params, "", null);

5
src/com/engine/organization/service/impl/JobServiceImpl.java
View File

@ -321,7 +321,10 @@ public class JobServiceImpl extends Service implements JobService {
}
if (StringUtils.isBlank(params.get("show_order").toString())) {
int maxShowOrder = getJobMapper().getMaxShowOrder();
Integer maxShowOrder = getJobMapper().getMaxShowOrder();
if (null == maxShowOrder) {
maxShowOrder = 0;
}
params.put("show_order", maxShowOrder + 1);
}
Long jobId = getExtService(user).updateExtForm(user, EXTEND_TYPE, JCL_ORG_JOB, params, "", null);