Merge remote-tracking branch 'origin/master'

lyh

昨天 bc8cd378fd72f43e66120c540f57f630580aa093

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentTransferController.java

@@ -123,9 +123,8 @@
    @DeleteMapping(value = "/delete")
    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
        EamEquipmentTransfer entity = eamEquipmentTransferService.getById(id);
        if (entity != null) {
            entity.setDelFlag(CommonConstant.DEL_FLAG_1);
            eamEquipmentTransferService.updateById(entity);
        if (entity != null && !EquipmentTransferStatusEnum.WAIT_SUBMIT.name().equals(entity.getTransferStatus())) {
            eamEquipmentTransferService.removeById(entity);
        }
        return Result.OK("删除成功!");
    }
@@ -140,13 +139,12 @@
    @ApiOperation(value = "设备归属变动-批量删除", notes = "设备归属变动-批量删除")
    @DeleteMapping(value = "/deleteBatch")
    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
        this.eamEquipmentTransferService.removeByIds(Arrays.asList(ids.split(",")));
        List<String> list = Arrays.asList(ids.split(","));
        list.forEach(id -> {
            EamEquipmentTransfer entity = eamEquipmentTransferService.getById(id);
            if (entity != null) {
            if (entity != null && !EquipmentTransferStatusEnum.WAIT_SUBMIT.name().equals(entity.getTransferStatus())) {
                entity.setDelFlag(CommonConstant.DEL_FLAG_1);
                eamEquipmentTransferService.updateById(entity);
                eamEquipmentTransferService.removeById(entity);
            }
        });
        return Result.OK("批量删除成功！");