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/BsManualServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
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 24b27ad..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;
}
@@ -59,10 +61,10 @@
if (list.size() > 0) {
throw new ServiceException("鎵嬪唽閲嶅", HttpStatus.HTTP_PARTIAL);
}
- List<BsManual> vList = baseMapper.selectList(new LambdaQueryWrapper<BsManual>().eq(BsManual::getVersionCode, bo.getVersionCode()));
- if (vList.size() > 0) {
- throw new ServiceException("鍙戝竷鐗堟湰閲嶅", HttpStatus.HTTP_PARTIAL);
- }
+// List<BsManual> vList = baseMapper.selectList(new LambdaQueryWrapper<BsManual>().eq(BsManual::getVersionCode, bo.getVersionCode()));
+// if (vList.size() > 0) {
+// throw new ServiceException("鍙戝竷鐗堟湰閲嶅", HttpStatus.HTTP_PARTIAL);
+// }
BsManual add = BeanUtil.toBean(bo, BsManual.class);
validEntityBeforeSave(add);
boolean flag = save(add);
@@ -80,12 +82,12 @@
if (list.size() > 0) {
throw new ServiceException("鎵嬪唽閲嶅", HttpStatus.HTTP_PARTIAL);
}
- List<BsManual> vList = baseMapper.selectList(new LambdaQueryWrapper<BsManual>()
- .eq(BsManual::getVersionCode, bo.getVersionCode())
- .ne(BsManual::getId, bo.getId()));
- if (vList.size() > 0) {
- throw new ServiceException("鍙戝竷鐗堟湰閲嶅", HttpStatus.HTTP_PARTIAL);
- }
+// List<BsManual> vList = baseMapper.selectList(new LambdaQueryWrapper<BsManual>()
+// .eq(BsManual::getVersionCode, bo.getVersionCode())
+// .ne(BsManual::getId, bo.getId()));
+// if (vList.size() > 0) {
+// throw new ServiceException("鍙戝竷鐗堟湰閲嶅", HttpStatus.HTTP_PARTIAL);
+// }
BsManual update = BeanUtil.toBean(bo, BsManual.class);
validEntityBeforeSave(update);
return updateById(update);
--
Gitblit v1.9.1