diff --git a/src/main/java/com/cm/serviceusercenter/pojo/vos/DepartmentVO.java b/src/main/java/com/cm/serviceusercenter/pojo/vos/DepartmentVO.java
index 0304013..f0ad6e2 100644
--- a/src/main/java/com/cm/serviceusercenter/pojo/vos/DepartmentVO.java
+++ b/src/main/java/com/cm/serviceusercenter/pojo/vos/DepartmentVO.java
@@ -25,8 +25,8 @@ public class DepartmentVO {
private String departmentNameEn;
@ApiModelProperty(name = "departmentNameOther", value = "组织部门名称(其他类型)")
private String departmentNameOther;
- @ApiModelProperty(name = "departmentType", value = "组织部门类型,1:机构,2:部门")
- @CheckNumberAnnotation(name = "组织部门类型", types = {"1", "2"})
+ @ApiModelProperty(name = "departmentType", value = "组织部门类型,1:机构,2:部门,3:委办局,4:街镇,5:村社区")
+ @CheckNumberAnnotation(name = "组织部门类型", types = {"1", "2", "3", "4", "5"})
private Integer departmentType;
@ApiModelProperty(name = "departmentState", value = "组织部门状态,1:正常,2:异常,3:停用")
@CheckNumberAnnotation(name = "组织部门状态", types = {"1", "2", "3"})
diff --git a/src/main/resources/static/route/system/department/get.html b/src/main/resources/static/route/system/department/get.html
index 953e81a..e77969f 100644
--- a/src/main/resources/static/route/system/department/get.html
+++ b/src/main/resources/static/route/system/department/get.html
@@ -79,6 +79,8 @@
+
+
diff --git a/src/main/resources/static/route/system/department/list.html b/src/main/resources/static/route/system/department/list.html
index 3f98157..ebeefbb 100644
--- a/src/main/resources/static/route/system/department/list.html
+++ b/src/main/resources/static/route/system/department/list.html
@@ -107,6 +107,12 @@
case 3:
value = '委办局';
break;
+ case 4:
+ value = '街镇';
+ break;
+ case 5:
+ value = '村社区';
+ break;
default:
value = '无';
}
diff --git a/src/main/resources/static/route/system/department/save-merge.html b/src/main/resources/static/route/system/department/save-merge.html
index 1496666..240cad6 100644
--- a/src/main/resources/static/route/system/department/save-merge.html
+++ b/src/main/resources/static/route/system/department/save-merge.html
@@ -64,6 +64,8 @@
+
diff --git a/src/main/resources/static/route/system/department/save-split.html b/src/main/resources/static/route/system/department/save-split.html
index 6c3da0d..efec8d7 100644
--- a/src/main/resources/static/route/system/department/save-split.html
+++ b/src/main/resources/static/route/system/department/save-split.html
@@ -70,6 +70,8 @@
+
diff --git a/src/main/resources/static/route/system/department/save.html b/src/main/resources/static/route/system/department/save.html
index 0244230..e01d1d8 100644
--- a/src/main/resources/static/route/system/department/save.html
+++ b/src/main/resources/static/route/system/department/save.html
@@ -79,6 +79,8 @@
+
+
diff --git a/src/main/resources/static/route/system/department/update-split.html b/src/main/resources/static/route/system/department/update-split.html
index aa0ea9c..f330e10 100644
--- a/src/main/resources/static/route/system/department/update-split.html
+++ b/src/main/resources/static/route/system/department/update-split.html
@@ -70,6 +70,8 @@
+
diff --git a/src/main/resources/static/route/system/department/update.html b/src/main/resources/static/route/system/department/update.html
index 9978b03..a2f114c 100644
--- a/src/main/resources/static/route/system/department/update.html
+++ b/src/main/resources/static/route/system/department/update.html
@@ -79,6 +79,8 @@
+
+