From 03a648f2e71f9aa537f0c609f0b3cbdfe9bb07da Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Mon, 20 Oct 2025 16:54:35 +0800 Subject: [PATCH] =?UTF-8?q?fix(oa):=20=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=A2=E6=88=B7ID=E6=9B=B4=E6=96=B0=E4=B8=8E=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加客户ID字段更新策略，允许设置为null - 增加客户ID作为项目查询的筛选条件- 处理客户ID为0时的特殊逻辑，自动转换为null- 优化项目列表查询，支持按客户ID过滤 --- .../src/main/java/com/ruoyi/oa/domain/SysOaProject.java | 1 + .../ruoyi/oa/service/impl/SysOaProjectServiceImpl.java | 9 +++++++++ 2 files changed, 10 insertions(+) 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; }