From 62fc5c26cf9a96eeefc4aff8590349ba75913006 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期二, 13 九月 2022 10:40:36 +0800
Subject: [PATCH] 配置工具修改
---
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsRulesServiceImpl.java | 2 ++
ytsl-license/pom.xml | 18 ++++++++++++++++++
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsManualServiceImpl.java | 2 ++
pom.xml | 1 +
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsTemplateServiceImpl.java | 2 ++
5 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/pom.xml b/pom.xml
index ef4a0bd..60061cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -300,6 +300,7 @@
<module>ruoyi-extend</module>
<module>ruoyi-oss</module>
<module>ruoyi-oa</module>
+ <module>ytsl-license</module>
</modules>
<packaging>pom</packaging>
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsManualServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsManualServiceImpl.java
index a200547..883cd1b 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsManualServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsManualServiceImpl.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.oa.domain.BsRules;
import com.ruoyi.oa.domain.BsTemplate;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
@@ -50,6 +51,7 @@
private LambdaQueryWrapper<BsManual> buildQueryWrapper(BsManualBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<BsManual> lqw = Wrappers.lambdaQuery();
+ lqw.like(bo.getManual() != null, BsManual::getManual, bo.getManual());
return lqw;
}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsRulesServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsRulesServiceImpl.java
index 3274c27..ca52f86 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsRulesServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsRulesServiceImpl.java
@@ -7,6 +7,7 @@
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.oa.domain.DevEquipment;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -49,6 +50,7 @@
private LambdaQueryWrapper<BsRules> buildQueryWrapper(BsRulesBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<BsRules> lqw = Wrappers.lambdaQuery();
+ lqw.like(bo.getRules() != null, BsRules::getRules, bo.getRules());
return lqw;
}
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsTemplateServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsTemplateServiceImpl.java
index d56e1a3..740455a 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsTemplateServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/BsTemplateServiceImpl.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.core.page.PagePlus;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.oa.domain.BsRules;
+import com.ruoyi.oa.domain.DevEquipment;
import org.springframework.stereotype.Service;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -50,6 +51,7 @@
private LambdaQueryWrapper<BsTemplate> buildQueryWrapper(BsTemplateBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<BsTemplate> lqw = Wrappers.lambdaQuery();
+ lqw.like(bo.getTemplateName() != null, BsTemplate::getTemplateName, bo.getTemplateName());
return lqw;
}
diff --git a/ytsl-license/pom.xml b/ytsl-license/pom.xml
new file mode 100644
index 0000000..9bf559f
--- /dev/null
+++ b/ytsl-license/pom.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>ruoyi-vue-plus</artifactId>
+ <groupId>com.ruoyi</groupId>
+ <version>3.4.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>license</artifactId>
+
+ <description>
+ 鎺堟潈妯″潡
+ </description>
+
+</project>
--
Gitblit v1.9.1