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 e9dff74..9aa8b3e 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 @@ -154,5 +154,5 @@ public class SysOaProject extends BaseEntity { */ private String projectCode; //签约公司 - private String signingCompany; + private Integer signingCompany; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java index d842afa..25bd5e7 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaProjectBo.java @@ -3,6 +3,7 @@ package com.ruoyi.oa.domain.bo; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; +import liquibase.pro.packaged.I; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.*; @@ -189,6 +190,6 @@ public class SysOaProjectBo extends BaseEntity { private String status; //签约公司 - private String signingCompany; + private Integer signingCompany; } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java index 9225960..4b2f14f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java @@ -256,6 +256,6 @@ public class SysOaProjectVo { */ private String status; //签约公司 - private String signingCompany; + private Integer signingCompany; } 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 a7fe8e7..bf83d66 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 @@ -181,7 +181,7 @@ public class SysOaProjectServiceImpl implements ISysOaProjectService { lqw.eq(StringUtils.isNotBlank(bo.getProjectStatus()), SysOaProject::getProjectStatus, bo.getProjectStatus()); lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), SysOaProject::getCreateBy, bo.getCreateBy()); //新增签约公司作为筛选条件 - lqw.eq(StringUtils.isNotBlank(bo.getSigningCompany()), SysOaProject::getSigningCompany, bo.getSigningCompany()); + lqw.eq(bo.getSigningCompany()!= null, SysOaProject::getSigningCompany, bo.getSigningCompany()); lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, SysOaProject::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime")); lqw.orderByDesc(SysOaProject::getCreateTime);