Browse Source

补助页面修改(选择,加下拉条件) - 增加了排除部门的条件

bing 12 hours ago
parent
commit
86c814637a

+ 7 - 0
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/domain/bo/PtUserAccountBo.java

@@ -12,6 +12,8 @@ import lombok.Data;
12 12
 import lombok.EqualsAndHashCode;
13 13
 import jakarta.validation.constraints.*;
14 14
 import java.util.Date;
15
+import java.util.List;
16
+
15 17
 import com.fasterxml.jackson.annotation.JsonFormat;
16 18
 import org.dromara.common.sensitive.annotation.Sensitive;
17 19
 import org.dromara.common.sensitive.core.SensitiveStrategy;
@@ -205,6 +207,11 @@ public class PtUserAccountBo extends BaseEntity {
205 207
      */
206 208
     private String userType;
207 209
 
210
+    /**
211
+     * 需要排除的部门Id集合
212
+     */
213
+    private List<Long> excludeDeptsAndChildren;
214
+
208 215
     // 构建器类
209 216
     public static class Builder {
210 217
         private Long userId;

+ 1 - 0
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/service/impl/PtUserAccountServiceImpl.java

@@ -1,6 +1,7 @@
1 1
 package org.dromara.backstage.payment.service.impl;
2 2
 
3 3
 import cn.hutool.core.bean.BeanUtil;
4
+import cn.hutool.core.collection.CollectionUtil;
4 5
 import cn.hutool.core.io.FileUtil;
5 6
 import cn.hutool.core.lang.UUID;
6 7
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

+ 6 - 0
ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/payment/PtUserAccountMapper.xml

@@ -68,6 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
68 68
             <if test="bo.phone != null and  bo.phone != ''">
69 69
                 and u.phone = #{bo.phone}
70 70
             </if>
71
+            <if test="bo.excludeDeptsAndChildren != null and bo.excludeDeptsAndChildren.size() > 0">
72
+                and a.dept_id not in
73
+                <foreach collection="bo.excludeDeptsAndChildren" item="item" open="(" separator="," close=")">
74
+                    #{item}
75
+                </foreach>
76
+            </if>
71 77
         </where>
72 78
         order by u.dept_id,u.user_id
73 79
     </select>