|
|
|
@ -92,7 +92,8 @@ public class PoliceController { |
|
|
|
throw new RuntimeException(String.format("该人员[%s]已存在于“%s”单位中,请联系二级机构或市局管理员以进行人员调整。", policeDto.getIdCode(), depart.getName())); |
|
|
|
throw new RuntimeException(String.format("该人员[%s]已存在于“%s”单位中,请联系二级机构或市局管理员以进行人员调整。", policeDto.getIdCode(), depart.getName())); |
|
|
|
} |
|
|
|
} |
|
|
|
SupPolice delPolice= supPoliceMapper.selectByIdCodeAndDel(policeDto.getIdCode(), AppConstants.DEL); |
|
|
|
SupPolice delPolice= supPoliceMapper.selectByIdCodeAndDel(policeDto.getIdCode(), AppConstants.DEL); |
|
|
|
if (Objects.nonNull(delPolice)){ |
|
|
|
if (Objects.nonNull(delPolice) && StrUtil.isNotBlank(delPolice.getDelReason()) |
|
|
|
|
|
|
|
&& !"退休".equals(delPolice.getDelReason()) && !"离职".equals(delPolice.getDelReason())){ |
|
|
|
delPolice.setOrgId(policeDto.getOrgId()); |
|
|
|
delPolice.setOrgId(policeDto.getOrgId()); |
|
|
|
delPolice.setDel(AppConstants.UN_DEL); |
|
|
|
delPolice.setDel(AppConstants.UN_DEL); |
|
|
|
delPolice.setDelReason(""); |
|
|
|
delPolice.setDelReason(""); |
|
|
|
|