解决代码冲突问题

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -29,10 +29,10 @@ public enum EpmetErrorCode {
 
     CANNOT_AUDIT_WARM(8201, "请完善居民信息"),
 	NOT_DEL_AGENCY(8202, "该机关存在下级机关，不允许删除"),
-	REQUIRE_PERMISSION(8203, "没有足够的操作权限"),
-	NOT_DEL_AGENCY(8204, "该机关存在下级机关，不允许删除"),
 	NOT_DEL_AGENCY_PER(8205, "该机关存在工作人员，不允许删除"),
-	NOT_DEL_DEPARTMENT(8206, "该部门存在工作人员，不允许删除");
+	NOT_DEL_DEPARTMENT(8206, "该部门存在工作人员，不允许删除"),
+
+	REQUIRE_PERMISSION(8301, "没有足够的操作权限");
 
 
 	private int code;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java

@@ -2,13 +2,12 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.form.AddDepartmentFormDTO;
-import com.epmet.service.CustomerStaffDepartmentService;
-
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.AddDepartmentResultDTO;
+import com.epmet.dto.result.DepartmentDetailResultDTO;
+import com.epmet.dto.result.DepartmentInAgencyResultDTO;
+import com.epmet.dto.result.DepartmentListResultDTO;
 import com.epmet.service.DepartmentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -16,27 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-/**
- * @Auther zxc
- * @Create 2020-04-24 14:48
- */
-@RestController
-@RequestMapping(value = "/department")
-public class DepartmentController {
-
-    @Autowired
-    private CustomerStaffDepartmentService customerStaffDepartmentService;
-
-    @PostMapping(value = "adddepartmentstaff")
-    public Result addDepartmentStaff(@LoginUser TokenDto tokenDto, @RequestBody AddDepartmentFormDTO addDepartmentFormDTO){
-        return null;
-    }
-
-}
-
 import java.util.List;
 
-
 /**
  * 部门
  *
@@ -49,6 +29,11 @@ public class DepartmentController {
     @Autowired
     private DepartmentService departmentService;
 
+    @PostMapping(value = "adddepartmentstaff")
+    public Result addDepartmentStaff(@LoginUser TokenDto tokenDto, @RequestBody AddDepartmentFormDTO addDepartmentFormDTO){
+        return null;
+    }
+
     /**
      * @param formDTO
      * @return