From 5a31b2ea65bc435ae8a57f5a692fc71685e990ad Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期四, 12 五月 2022 10:51:29 +0800
Subject: [PATCH] 提交代码
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java
index 385e851..5adb403 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/BsSchoolController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.oa;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.annotation.DataDictClass;
import com.ruoyi.common.annotation.Log;
@@ -11,7 +12,9 @@
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.oa.domain.BsSchool;
import com.ruoyi.oa.domain.bo.BsSchoolBo;
import com.ruoyi.oa.domain.vo.BsSchoolVo;
import com.ruoyi.oa.service.IBsSchoolService;
@@ -61,8 +64,9 @@
*/
@ApiOperation("瀛︽牎涓嬫媺鍒楄〃")
@GetMapping("/select")
- public AjaxResult selectList() {
- return AjaxResult.success(iBsSchoolService.list(new QueryWrapper<>()));
+ public AjaxResult selectList(BsSchoolBo bo) {
+ return AjaxResult.success(iBsSchoolService.list(new LambdaQueryWrapper<BsSchool>()
+ .like(StringUtils.isNotBlank(bo.getName()), BsSchool::getName, bo.getName())));
}
/**
@@ -84,8 +88,8 @@
@PreAuthorize("@ss.hasPermi('oa:school:query')")
@GetMapping("/{id}")
public AjaxResult<BsSchoolVo> getInfo(@ApiParam("涓婚敭")
- @NotNull(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable("id") Long id) {
+ @NotNull(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable("id") Long id) {
return AjaxResult.success(iBsSchoolService.queryById(id));
}
@@ -118,11 +122,11 @@
*/
@ApiOperation("鍒犻櫎瀛︽牎")
@PreAuthorize("@ss.hasPermi('oa:school:remove')")
- @Log(title = "瀛︽牎" , businessType = BusinessType.DELETE)
+ @Log(title = "瀛︽牎", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult<Void> remove(@ApiParam("涓婚敭涓�")
- @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long[] ids) {
+ @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable Long[] ids) {
return toAjax(iBsSchoolService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
}
}
--
Gitblit v1.9.1