diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 20cd2025..0895cbd4 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -586,6 +586,8 @@ create table JCL_ORG_CARDBUTTON ( url varchar(255) null, roles varchar(2000) null, sys_default int not null, + show_order int null, + open int null, creator int null, delete_type int null, create_time date null, diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql index 06682d35..c57283b3 100644 --- a/docs/表结构SQL/Oracle.sql +++ b/docs/表结构SQL/Oracle.sql @@ -504,4 +504,38 @@ create table JCL_ORG_DETACH ( ); +CREATE TABLE JCL_ORG_CARDACCESS ( + ID NUMBER NOT NULL, + TYPE_ID NUMBER NOT NULL, + TYPE_NAME NVARCHAR2(50) NOT NULL, + STATUS NUMBER NULL, + ALL_PEOPLE NUMBER NULL, + SUPERIOR NUMBER NULL, + ALL_SUPERIOR NUMBER NULL, + CUSTOM NVARCHAR2(2000) NULL , + DELETE_TYPE NUMBER NULL, + CREATOR NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_CARDACCESS_PK PRIMARY KEY (ID) +) + +CREATE TABLE JCL_ORG_CARDBUTTON ( + ID NUMBER NOT NULL, + NAME NVARCHAR2(255) NOT NULL, + STATUS NUMBER NULL, + URL NVARCHAR2(255) NULL, + ROLES NVARCHAR2(2000) NULL, + SYS_DEFAULT NUMBER NOT NULL, + SHOW_ORDER NUMBER NULL, + OPEN NUMBER NULL, + CREATOR NUMBER NULL, + DELETE_TYPE NUMBER NULL, + CREATE_TIME DATE NULL, + UPDATE_TIME DATE NULL, + CONSTRAINT JCL_ORG_CARDBUTTON_PK PRIMARY KEY (ID) +) + + + diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql index 8bdb7c43..90696e31 100644 --- a/docs/表结构SQL/SqlServer.sql +++ b/docs/表结构SQL/SqlServer.sql @@ -564,6 +564,8 @@ CREATE TABLE JCL_ORG_CARDBUTTON ( url varchar(255) NULL, roles varchar(2000) NULL, sys_default int NOT NULL, + show_order int null, + open int null, creator int NULL, delete_type int NULL, create_time date NULL, diff --git a/src/com/engine/organization/enums/OrgImportEnum.java b/src/com/engine/organization/enums/OrgImportEnum.java index eea07e33..a4fe57b5 100644 --- a/src/com/engine/organization/enums/OrgImportEnum.java +++ b/src/com/engine/organization/enums/OrgImportEnum.java @@ -1,6 +1,7 @@ package com.engine.organization.enums; import com.engine.organization.exception.OrganizationRunTimeException; +import com.engine.organization.util.saveimport.PostInfoImportUtil; import com.engine.organization.util.saveimport.StaffInfoImportUtil; import weaver.hrm.User; @@ -27,6 +28,20 @@ public enum OrgImportEnum implements OrgImportAdapter { public List> orgForm(User user) { return StaffInfoImportUtil.importForm(user); } + }, + POSTINFO("postInfo"){ + @Override + public Map orgImport(Map params, User user) { + Map resultMap = new HashMap<>(); + String excelFile = (String) params.get("excelfile"); + resultMap.put("pId", PostInfoImportUtil.saveImport("add", excelFile, user)); + return resultMap; + } + + @Override + public List> orgForm(User user) { + return PostInfoImportUtil.importForm(user); + } }; diff --git a/src/com/engine/organization/mapper/post/PostMapper.java b/src/com/engine/organization/mapper/post/PostMapper.java index ad3bd827..c22834ed 100644 --- a/src/com/engine/organization/mapper/post/PostMapper.java +++ b/src/com/engine/organization/mapper/post/PostMapper.java @@ -26,6 +26,8 @@ public interface PostMapper { */ PostPO getPostByID(@Param("id") long id); + PostPO getPostByName(@Param("postName") String postName); + List listByName(@Param("postName") String postName); /** diff --git a/src/com/engine/organization/mapper/post/PostMapper.xml b/src/com/engine/organization/mapper/post/PostMapper.xml index 4ceb10c3..8df75003 100644 --- a/src/com/engine/organization/mapper/post/PostMapper.xml +++ b/src/com/engine/organization/mapper/post/PostMapper.xml @@ -53,6 +53,13 @@ from jcl_org_post where delete_type = '0' + + +