diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java index 73f5ddcb..6cb4e70b 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mechanical/jxzgbh/domain/vo/JxYhzgbhVo.java @@ -132,7 +132,7 @@ public class JxYhzgbhVo implements Serializable { /** * 整改人 */ - @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "discoverId") + @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "abarbeitung") private String abarbeitungName; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/impl/PdMasterServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/impl/PdMasterServiceImpl.java index b0ebd54c..1f66a312 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/impl/PdMasterServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/patch/service/impl/PdMasterServiceImpl.java @@ -402,6 +402,7 @@ public class PdMasterServiceImpl extends ServiceImpl i if(isValid){ //TODO 做一些业务上的校验,判断是否需要校验 } + pdMasterUserService.getBaseMapper().delete(new LambdaQueryWrapper().in(PdMasterUser::getOrdersid, ids)); return baseMapper.deleteByIds(ids) > 0; }