From a36f6ad6070b8230673eab6a01c7bdbcc5e3e640 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 28 十月 2022 12:04:36 +0800
Subject: [PATCH] 添加条件判断
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java | 12 +++++++++++-
ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java | 3 +--
ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml | 25 +++++++++++++------------
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 5 ++++-
ycl-common/src/main/java/com/ycl/vo/user/UserVO.java | 2 +-
5 files changed, 30 insertions(+), 17 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
index f87c644..f811128 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
@@ -92,7 +92,10 @@
@ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
private Integer isGrid;
- @ApiModelProperty(value = "瑙掕壊鍒楄〃")
+ @ApiModelProperty(value = "鍏抽敭瀛楁")
+ @TableField(exist = false)
+ private String keyword;
+ @ApiModelProperty(value = "閮ㄩ棬")
@TableField(exist = false)
private UmsDepart depart;
@ApiModelProperty(value = "瑙掕壊鍒楄〃")
diff --git a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
index 0fcda1c..fecdb07 100644
--- a/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
+++ b/ycl-common/src/main/java/com/ycl/mapper/user/UmsAdminMapper.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.user.UmsAdmin;
-import com.ycl.vo.user.UserVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -23,6 +22,6 @@
*/
List<Long> getAdminIdList(@Param("resourceId") Long resourceId);
- Page<UmsAdmin> selectCondPage(@Param("page") Page<UmsAdmin> page, @Param("umsAdmin") UserVO.PageUserVO pageUserVO);
+ Page<UmsAdmin> selectCondPage(Page<UmsAdmin> page,UmsAdmin umsAdmin);
}
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
index 7664f29..8eddde1 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -359,7 +359,17 @@
if (PojoUtils.Vo.isUsefulSearchParam(pageUserVO.getUserType())) {
queryWrapper.eq(UmsAdmin::getUserType, pageUserVO.getUserType());
}*/
- Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,pageUserVO);
+ UmsAdmin umsAdmin = new UmsAdmin();
+ if (pageUserVO.getUserType()!=null) {
+ umsAdmin.setUserType(pageUserVO.getUserType());
+ }
+ if (pageUserVO.getKeyword()!=null&&!("".equals(pageUserVO.getKeyword()))) {
+ umsAdmin.setKeyword(pageUserVO.getKeyword());
+ }
+ if (pageUserVO.getJobTitle()!=null&&!("".equals(pageUserVO.getJobTitle()))) {
+ umsAdmin.setJobTitle(pageUserVO.getJobTitle());
+ }
+ Page<UmsAdmin> page1 = baseMapper.selectCondPage(page,umsAdmin);
return page1;
}
diff --git a/ycl-common/src/main/java/com/ycl/vo/user/UserVO.java b/ycl-common/src/main/java/com/ycl/vo/user/UserVO.java
index e75ae4c..f5b04a2 100644
--- a/ycl-common/src/main/java/com/ycl/vo/user/UserVO.java
+++ b/ycl-common/src/main/java/com/ycl/vo/user/UserVO.java
@@ -20,7 +20,7 @@
@ApiModelProperty(value = "鐢ㄦ埛绫诲瀷,0鍗充负鏌ヨ鍏ㄩ儴锛岄粯璁�0",example = "0")
- private byte userType;
+ private Byte userType;
@ApiModelProperty(value = "鑱屽姟")
private String jobTitle;
diff --git a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
index 8f02c2e..c62face 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
@@ -77,18 +77,19 @@
LEFT JOIN ums_depart ud ON udm.depart_id = ud.id
LEFT JOIN ums_admin_role_relation uarr ON ua.id = uarr.admin_id
LEFT JOIN ums_role ur ON uarr.role_id = ur.id
- where 1=1
- <if test="umsAdmin.keyword !=null and umsAdmin.keyword =''">
- AND (ua.username LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
- or ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
- or ua.mobile ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%'))
- </if>
- <if test="umsAdmin.userType !=null and umsAdmin.userType >=0 ">
- AND ua.user_type = #{umsAdmin.userType}
- </if>
- <if test="umsAdmin.jobTitle !=null and umsAdmin.jobTitle=''">
- AND ua.job_title = #{umsAdmin.jobTitle}
- </if>
+ <where>
+ <if test="umsAdmin.keyword !=null and umsAdmin.keyword !=''">
+ AND (ua.username LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
+ or ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
+ or ua.mobile LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%'))
+ </if>
+ <if test="umsAdmin.userType !=null and umsAdmin.userType >=0 ">
+ AND ua.user_type = #{umsAdmin.userType}
+ </if>
+ <if test="umsAdmin.jobTitle !=null and umsAdmin.keyword !=''">
+ AND ua.job_title = #{umsAdmin.jobTitle}
+ </if>
+ </where>
ORDER BY
ua.id DESC
</select>
--
Gitblit v1.8.0