Merge branch 'dev_staff_transfer' into dev_temp

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

@@ -79,6 +79,7 @@ public enum EpmetErrorCode {
 	GRID_COUNT_UP(8407,"您的创建网格数量已到达上限，请联系管理员设置"),
 	EXIT_PEND_PROJECT(8408,"该工作人员有项目尚在处理，处理完毕方可操作"),
 	EXIT_PUBLISHED_ACTIVITY(8409,"该工作人员有活动尚在进行，等活动完成方可操作"),
+	CAN_NOT_SELF(8410,"无法对自己进行操作"),
 
 	ALREADY_EVALUATE(8501,"您已评价"),
 	ALREADY_VOTE(8502,"您已表态"),

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

@@ -194,6 +194,9 @@ public class StaffServiceImpl implements StaffService {
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void staffTransfer(TokenDto tokenDto, StaffTransferFormDTO fromDTO) {
+		if (tokenDto.getUserId().equals(fromDTO.getStaffId())) {
+			throw new RenException(EpmetErrorCode.CAN_NOT_SELF.getCode());
+		}
 		//1.获取工作人员与机关关系
 		CustomerStaffAgencyDTO staffAgencyDTO = customerStaffAgencyService.getInfoByUserId(fromDTO.getStaffId());
 		String oldAgency = staffAgencyDTO.getAgencyId();