Merge remote-tracking branch 'origin/dev_delete' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -183,9 +183,9 @@ public class IcResiUserController implements ResultDataResolver {
     public Result delete(@LoginUser TokenDto tokenDto, @RequestBody DelIcResiUserFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         ValidatorUtils.validateEntity(formDTO, DelIcResiUserFormDTO.IdGroup.class);
-//        icResiUserService.delete(formDTO);
-        icResiUserService.deleteBatchIds(formDTO.getUserIds());
         formDTO.getUserIds().forEach(userId -> {
+            formDTO.setIcResiUserId(userId);
+            icResiUserService.delete(formDTO);
             //推送MQ事件
             IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg();
             mqMsg.setCustomerId(tokenDto.getCustomerId());