diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql
index 5bb92ee6..6cffd642 100644
--- a/docs/表结构SQL/MySQL.sql
+++ b/docs/表结构SQL/MySQL.sql
@@ -549,8 +549,8 @@ create table JCL_ORG_ITEM (
create table JCL_ORG_DETACH (
id int auto_increment not null,
manager_type int null,
- ec_manager text not null,
- jcl_manager text not null,
+ ec_manager int not null,
+ jcl_manager int not null,
ec_rolelevel text not null,
jcl_rolelevel text not null,
manage_module text not null,
diff --git a/docs/表结构SQL/Oracle.sql b/docs/表结构SQL/Oracle.sql
index 67b0c456..a142b274 100644
--- a/docs/表结构SQL/Oracle.sql
+++ b/docs/表结构SQL/Oracle.sql
@@ -491,8 +491,8 @@ CREATE TABLE JCL_ORG_HRMRELATION (
create table JCL_ORG_DETACH (
id number not null,
manager_type number null,
- ec_manager clob not null,
- jcl_manager clob not null,
+ ec_manager NUMBER not null,
+ jcl_manager NUMBER not null,
ec_rolelevel varchar(4000) not null,
jcl_rolelevel varchar(4000) not null,
manage_module varchar(4000) not null,
diff --git a/docs/表结构SQL/SqlServer.sql b/docs/表结构SQL/SqlServer.sql
index b94299ae..93a84834 100644
--- a/docs/表结构SQL/SqlServer.sql
+++ b/docs/表结构SQL/SqlServer.sql
@@ -522,8 +522,8 @@ CREATE TABLE JCL_ORG_MAP (
create table JCL_ORG_DETACH (
id int IDENTITY(1,1) not null,
manager_type int null,
- ec_manager text not null,
- jcl_manager text not null,
+ ec_manager int not null,
+ jcl_manager int not null,
ec_rolelevel text not null,
jcl_rolelevel text not null,
manage_module text not null,
diff --git a/src/com/engine/organization/entity/detach/param/ManagerDetachParam.java b/src/com/engine/organization/entity/detach/param/ManagerDetachParam.java
index 1944a089..ea79ddf8 100644
--- a/src/com/engine/organization/entity/detach/param/ManagerDetachParam.java
+++ b/src/com/engine/organization/entity/detach/param/ManagerDetachParam.java
@@ -22,9 +22,9 @@ public class ManagerDetachParam {
private Integer managerType;
- private String ecManager;
+ private Integer ecManager;
- private String jclManager;
+ private Integer jclManager;
private String ecRolelevel;
diff --git a/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java b/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java
index a40e29d2..8ac75ee0 100644
--- a/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java
+++ b/src/com/engine/organization/entity/detach/po/ManagerDetachPO.java
@@ -30,11 +30,11 @@ public class ManagerDetachPO {
/**
* ec管理员
*/
- private String ecManager;
+ private Integer ecManager;
/**
* jcl管理员
*/
- private String jclManager;
+ private Integer jclManager;
/**
* ec分部
*/
diff --git a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java
index 6a1fdea0..09eb15f4 100644
--- a/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java
+++ b/src/com/engine/organization/entity/detach/vo/ManagerDetachVO.java
@@ -46,10 +46,10 @@ public class ManagerDetachVO {
private Long id;
- @OrganizationTableColumn(text = "管理员", width = "20%", column = "ec_manager" )
- private String ecManager;
+ @OrganizationTableColumn(text = "管理员", width = "20%", column = "ec_manager", transmethod = "com.engine.organization.transmethod.ManagerDetachTransMethod.getManagerName")
+ private Integer ecManager;
- @OrganizationTableColumn(text = "可管理组织机构", width = "40%", column = "ec_rolelevel")
+ @OrganizationTableColumn(text = "可管理组织机构", width = "40%", column = "ec_rolelevel",transmethod = "com.engine.organization.transmethod.ManagerDetachTransMethod.getRoleLevel")
private String ecRolelevel;
diff --git a/src/com/engine/organization/enums/LogModuleNameEnum.java b/src/com/engine/organization/enums/LogModuleNameEnum.java
index 7779b220..c0115316 100644
--- a/src/com/engine/organization/enums/LogModuleNameEnum.java
+++ b/src/com/engine/organization/enums/LogModuleNameEnum.java
@@ -18,6 +18,7 @@ public enum LogModuleNameEnum {
RESOURCE("人员管理", 11),
STAFFPLAN("编制方案", 12),
STAFF("编制上报", 13),
+ DETACH("模块管理分权", 14),
OTHER("其他模块", 99);
private String name;
diff --git a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml
index cfd02f55..d1ddc927 100644
--- a/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml
+++ b/src/com/engine/organization/mapper/detach/ManagerDetachMapper.xml
@@ -176,10 +176,10 @@
update jcl_org_detach
- ecManager=#{ecManager},
- jclManager=#{jclManager},
- ecRolelevel=#{ecRolelevel},
- jclRolelevel=#{jclRolelevel}
+ ec_manager=#{ecManager},
+ jcl_Manager=#{jclManager},
+ ec_rolelevel=#{ecRolelevel},
+ jcl_rolelevel=#{jclRolelevel}
WHERE id = #{id} AND delete_type = 0
@@ -198,7 +198,7 @@
-
+
+ select
+ lastname as "name",
+ id as "id"
+ from hrmresource
+ WHERE id IN
+
+ #{id}
+
+
\ No newline at end of file
diff --git a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java
index 19365ba4..25f5cc8e 100644
--- a/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java
+++ b/src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java
@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Param;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
/**
* @author:dxfeng
@@ -18,6 +19,8 @@ public interface SystemDataMapper {
String getScCompanyNameById(@Param("companyId") String companyId);
+ List