diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java index 247fe4e..0fe00d3 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/SysOaProject.java @@ -162,6 +162,7 @@ public class SysOaProject extends BaseEntity { private Integer postponeCount; //客户id + @TableField(updateStrategy = FieldStrategy.IGNORED) private Long customerId; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java index d9090fd..5c76c7e 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/SysOaProjectServiceImpl.java @@ -190,6 +190,8 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService { lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, SysOaProject::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); lqw.orderByDesc(SysOaProject::getCreateTime); + //客户id作为筛选条件 + lqw.eq(bo.getCustomerId() != null, SysOaProject::getCustomerId, bo.getCustomerId()); return lqw; } @@ -220,7 +222,14 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService { // 只有当前缀在上面列表里,才真正去生成新编号 bo.setProjectCode(codeGeneratorService.nextCode(prefix)); } + SysOaProject update = BeanUtil.toBean(bo, SysOaProject.class); + + // 当 customerId 为 0 时,设置为 null + if (bo.getCustomerId() == 0) { + update.setCustomerId(null); + } + validEntityBeforeSave(update); return baseMapper.updateById(update) > 0; }