添加部门类型

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:部门")
+    @ApiModelProperty(name = "departmentType", value = "组织部门类型,1:机构,2:部门,3:委办局,4:街镇,5:村社区")
-    @CheckNumberAnnotation(name = "组织部门类型", types = {"1", "2"})
+    @CheckNumberAnnotation(name = "组织部门类型", types = {"1", "2", "3", "4", "5"})
     private Integer departmentType;
     @ApiModelProperty(name = "departmentState", value = "组织部门状态,1:正常,2:异常,3:停用")
     @CheckNumberAnnotation(name = "组织部门状态", types = {"1", "2", "3"})

src/main/resources/static/route/system/department/get.html

@@ -79,6 +79,8 @@
                                     <option value="1" selected>机构</option>
                                     <option value="2">部门</option>
                                     <option value="3">委办局</option>
+                                    <option value="4">街镇</option>
+                                    <option value="5">村社区</option>
                                 </select>
                             </div>
                         </div>

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 = '无';
                             }

src/main/resources/static/route/system/department/save-merge.html

@@ -64,6 +64,8 @@
                                     <option value="1" selected>机构</option>
                                     <option value="2">部门</option>
                                     <option value="3">委办局<option>
+                                    <option value="4">街镇</option>
+                                    <option value="5">村社区</option>
                                 </select>
                             </div>
                         </div>

src/main/resources/static/route/system/department/save-split.html

@@ -70,6 +70,8 @@
                                     <option value="1" selected>机构</option>
                                     <option value="2">部门</option>
                                     <option value="3">委办局<option>
+                                    <option value="4">街镇</option>
+                                    <option value="5">村社区</option>
                                 </select>
                             </div>
                         </div>

src/main/resources/static/route/system/department/save.html

@@ -79,6 +79,8 @@
                                     <option value="1" selected>机构</option>
                                     <option value="2">部门</option>
                                     <option value="3">委办局</option>
+                                    <option value="4">街镇</option>
+                                    <option value="5">村社区</option>
                                 </select>
                             </div>
                         </div>

src/main/resources/static/route/system/department/update-split.html

@@ -70,6 +70,8 @@
                                     <option value="1" selected>机构</option>
                                     <option value="2">部门</option>
                                     <option value="3">委办局<option>
+                                    <option value="4">街镇</option>
+                                    <option value="5">村社区</option>
                                 </select>
                             </div>
                         </div>

src/main/resources/static/route/system/department/update.html

@@ -79,6 +79,8 @@
                                     <option value="1" selected>机构</option>
                                     <option value="2">部门</option>
                                     <option value="3">委办局</option>
+                                    <option value="4">街镇</option>
+                                    <option value="5">村社区</option>
                                 </select>
                             </div>
                         </div>