diff --git a/src/com/engine/organization/entity/company/bo/CompBO.java b/src/com/engine/organization/entity/company/bo/CompBO.java
index efbbe194..f0c62966 100644
--- a/src/com/engine/organization/entity/company/bo/CompBO.java
+++ b/src/com/engine/organization/entity/company/bo/CompBO.java
@@ -105,7 +105,7 @@ public class CompBO {
return comps.stream().map(item -> {
SearchTree tree = new SearchTree();
tree.setCanClick(true);
- tree.setCanceled(false);
+ tree.setCanceled(item.getForbiddenTag() != 0);
tree.setIcon("icon-coms-LargeArea");
tree.setId(item.getId().toString());
tree.setIsParent(false);
diff --git a/src/com/engine/organization/entity/department/bo/DepartmentBO.java b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
index 1e46142b..4973e807 100644
--- a/src/com/engine/organization/entity/department/bo/DepartmentBO.java
+++ b/src/com/engine/organization/entity/department/bo/DepartmentBO.java
@@ -127,7 +127,7 @@ public class DepartmentBO {
return departmentPOS.stream().map(item -> {
SearchTree tree = new SearchTree();
tree.setCanClick(true);
- tree.setCanceled(false);
+ tree.setCanceled(item.getForbiddenTag() != 0);
tree.setIcon(isLeaf ? "icon-coms-Branch" : "icon-coms-LargeArea");
tree.setId(item.getId().toString());
tree.setIsParent(false);
diff --git a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java
index 7db50123..b5213ea9 100644
--- a/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java
+++ b/src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java
@@ -78,12 +78,12 @@ public class PostInfoTableVO {
/**
* 说明
*/
- @OrganizationTableColumn(text = "说明", width = "20%", column = "description")
+ @OrganizationTableColumn(text = "说明", width = "30%", column = "description")
private String description;
/**
* 禁用标记
*/
- @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag")
+ @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}
diff --git a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java
index 2934666f..127687e8 100644
--- a/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java
+++ b/src/com/engine/organization/entity/scheme/vo/GradeTableVO.java
@@ -60,11 +60,7 @@ public class GradeTableVO {
*/
@OrganizationTableColumn(text = "名称", width = "20%", column = "grade_name")
private String gradeName;
- /**
- * 描述说明
- */
- @OrganizationTableColumn(text = "描述说明", width = "20%", column = "description")
- private String description;
+
/**
* 等级方案
*/
@@ -80,9 +76,14 @@ public class GradeTableVO {
@OrganizationTableColumn(text = "职等", width = "20%", column = "level_id", transmethod = "com.engine.organization.transmethod.LevelTransMethod.getLevelId")
private String levelId;
+ /**
+ * 描述说明
+ */
+ @OrganizationTableColumn(text = "描述说明", width = "30%", column = "description")
+ private String description;
/**
* 禁用标记
*/
- @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag")
+ @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private int forbiddenTag;
}
diff --git a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java
index 46f8b8d2..548af929 100644
--- a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java
+++ b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java
@@ -59,21 +59,22 @@ public class LevelTableVO {
@OrganizationTableColumn(text = "名称", width = "20%", column = "level_name")
private String levelName;
- /**
- * 描述说明
- */
- @OrganizationTableColumn(text = "描述说明", width = "20%", column = "description")
- private String description;
-
/**
* 等级方案
*/
@OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name")
private String schemeName;
+ /**
+ * 描述说明
+ */
+ @OrganizationTableColumn(text = "描述说明", width = "30%", column = "description")
+ private String description;
+
+
/**
* 禁用标记
*/
- @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag")
+ @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}
diff --git a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java
index 1062b88b..8313afe6 100644
--- a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java
+++ b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java
@@ -61,12 +61,12 @@ public class SchemeTableVO {
/**
* 方案描述
*/
- @OrganizationTableColumn(text = "方案说明", width = "25%", column = "scheme_description")
+ @OrganizationTableColumn(text = "方案说明", width = "40%", column = "scheme_description")
private String schemeDescription;
/**
* 禁用标识
*/
- @OrganizationTableColumn(text = "是否启用", width = "25%", column = "forbidden_tag")
+ @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}
diff --git a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java
index 93c1722c..47f8ec35 100644
--- a/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java
+++ b/src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java
@@ -65,11 +65,6 @@ public class SequenceTableVO {
@OrganizationTableColumn(text = "名称", width = "20%", column = "sequence_name")
private String sequenceName;
- /**
- * 描述说明
- */
- @OrganizationTableColumn(text = "描述说明", width = "20%", column = "description")
- private String description;
/**
* 等级方案
@@ -77,9 +72,15 @@ public class SequenceTableVO {
@OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name")
private String schemeName;
+ /**
+ * 描述说明
+ */
+ @OrganizationTableColumn(text = "描述说明", width = "30%", column = "description")
+ private String description;
+
/**
* 禁用标记
*/
- @OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag")
+ @OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}
diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
index 94cc2695..ef1ea6ba 100644
--- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
+++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
@@ -76,7 +76,7 @@