1.1.35 预算项目信息查询优化

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/enums/ProjectCategoryEnum.java

@@ -12,9 +12,14 @@ import org.dromara.common.core.enums.OAStatusEnum;
 public enum ProjectCategoryEnum {
 
     /**
-     * 销售（实施、物流）
+     * 销售（实施）
      */
-    MARKET("1", "销售（实施、物流）"),
+    IMPL("0", "销售（实施）"),
+
+    /**
+     * 销售（物流）
+     */
+    MARKET("1", "销售（物流）"),
 
     /**
      * 销售（备件）

ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpProjectInfoServiceImpl.java

@@ -452,7 +452,8 @@ public class ErpProjectInfoServiceImpl implements IErpProjectInfoService {
             {
                 if (StringUtils.isNotBlank(bo.getProjectCategory()) && bo.getProjectCategory().equals(ProjectCategoryEnum.MARKET.getCode())) {
                     w.eq(StringUtils.isNotBlank(bo.getProjectCategory()), ErpProjectInfo::getProjectCategory, ProjectCategoryEnum.MARKET.getCode())
-                        .or().eq(StringUtils.isNotBlank(bo.getProjectCategory()), ErpProjectInfo::getProjectCategory, ProjectCategoryEnum.MARKET_PART.getCode());
+                        .or().eq(StringUtils.isNotBlank(bo.getProjectCategory()), ErpProjectInfo::getProjectCategory, ProjectCategoryEnum.MARKET_PART.getCode())
+                            .or().eq(StringUtils.isNotBlank(bo.getProjectCategory()), ErpProjectInfo::getProjectCategory, ProjectCategoryEnum.IMPL.getCode());
                 } else if (StringUtils.isNotBlank(bo.getProjectCategory()) && bo.getProjectCategory().equals(ProjectCategoryEnum.RD.getCode())) {
                     w.eq(StringUtils.isNotBlank(bo.getProjectCategory()), ErpProjectInfo::getProjectCategory, ProjectCategoryEnum.RD.getCode())
                         .or().eq(StringUtils.isNotBlank(bo.getProjectCategory()), ErpProjectInfo::getProjectCategory, ProjectCategoryEnum.PRE_PRODUCTION.getCode());