Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg

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

@@ -38,7 +38,8 @@ public enum EpmetErrorCode {
 	NOT_ADD_GRID(8401,"您当前的网格名称已存在，请重新修改"),
 	MOBILE_USED(8402,"该手机号已注册"),
 	STAFF_ADD_FAILED(8403,"人员添加失败"),
-	STAFF_EDIT_FAILED(8404,"人员编辑失败");
+	STAFF_EDIT_FAILED(8404,"人员编辑失败"),
+	CANNOT_DISABLE_YOURSELF(8405,"您不能禁用自己"),;
 
 	private int code;
 	private String msg;

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

@@ -113,7 +113,7 @@ public class StaffController {
 	 * @return Result
 	 */
 	@PostMapping("disabledstaff")
-	public Result disabledStaff(@RequestBody StaffInfoFromDTO fromDTO){
-		return staffService.disabledStaff(fromDTO);
+	public Result disabledStaff(@LoginUser TokenDto tokenDto, @RequestBody StaffInfoFromDTO fromDTO){
+		return staffService.disabledStaff(tokenDto, fromDTO);
 	}
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/StaffService.java

@@ -80,6 +80,6 @@ public interface StaffService {
 	 * @param fromDTO 参数
 	 * @return Result
 	 */
-	Result disabledStaff(StaffInfoFromDTO fromDTO);
+	Result disabledStaff(TokenDto tokenDto, StaffInfoFromDTO fromDTO);
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -151,7 +151,10 @@ public class StaffServiceImpl implements StaffService {
 	}
 
 	@Override
-	public Result disabledStaff(StaffInfoFromDTO fromDTO) {
+	public Result disabledStaff(TokenDto tokenDto, StaffInfoFromDTO fromDTO) {
+		if (tokenDto.getUserId().equals(fromDTO.getStaffId())) {
+			return new Result().error(EpmetErrorCode.CANNOT_DISABLE_YOURSELF.getCode(), EpmetErrorCode.CANNOT_DISABLE_YOURSELF.getMsg());
+		}
 		return epmetUserFeignClient.disabledStaff(fromDTO);
 	}
 }