From 0031ab58f81fb114cec65df6cd69d9e3bfce7f41 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 31 Dec 2024 11:14:49 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=82=B9=E5=87=BB=E9=A5=AD=E5=8D=A1?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/800pjcloudx_wallet.sql                      | 18 ++++++++++++++++++
 .../main/resources/mapper/SysUserMapper.xml    |  4 ++++
 .../wallet/api/dto/WalletManageDto.java        |  4 ++++
 .../wallet/mapper/WalletManageMapper.java      |  4 +++-
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/db/800pjcloudx_wallet.sql b/db/800pjcloudx_wallet.sql
index 9860dcc2a..eff997fb3 100644
--- a/db/800pjcloudx_wallet.sql
+++ b/db/800pjcloudx_wallet.sql
@@ -126,3 +126,21 @@ CREATE TABLE wallet_transaction
 CREATE INDEX idx_dept_id ON wallet_transaction (wallet_id);
 
 
+
+CREATE TABLE `sys_user_face`
+(
+    id          bigint AUTO_INCREMENT NOT NULL COMMENT '编号',
+    user_id     bigint                NOT NULL COMMENT '用户ID',
+    face_img    varchar(256)          NOT NULL COMMENT '人脸图片',
+    create_by   varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    create_time datetime                               DEFAULT NULL COMMENT '创建时间',
+    update_by   varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人',
+    update_time datetime                               DEFAULT NULL COMMENT '修改时间',
+    del_flag    char(1) COLLATE utf8mb4_general_ci     DEFAULT '0' COMMENT '删除标记',
+    tenant_id   bigint                                 DEFAULT NULL COMMENT '租户ID',
+    PRIMARY KEY (id)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='人脸样本表';
+CREATE INDEX idx_dept_id ON sys_user_face (user_id);
+
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml
index fa4834c36..3baae8b80 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -169,6 +169,10 @@
                 <bind name="usernameLike" value="'%'+query.username+'%'"/>
                 AND u.username LIKE #{usernameLike}
             </if>
+            <if test="query.name != null and query.name != ''">
+                <bind name="nameLike" value="'%'+query.name+'%'"/>
+                AND u.name LIKE #{nameLike}
+            </if>
             <if test="query.deptId != null and query.deptId != ''">
                 AND u.dept_id = #{query.deptId}
             </if>
diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletManageDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletManageDto.java
index 848618ed7..42b58e05c 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletManageDto.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletManageDto.java
@@ -3,7 +3,11 @@ package com.bsd.pjcloud.wallet.api.dto;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class WalletManageDto extends WalletManageEntity {
 
+    private List<Long> userIds;
+
 }
\ No newline at end of file
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java
index ab6455daf..c36a9c825 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletManageMapper.java
@@ -1,5 +1,6 @@
 package com.bsd.pjcloud.wallet.mapper;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
@@ -37,7 +38,8 @@ public interface WalletManageMapper extends PjcloudBaseMapper<WalletManageEntity
                 .eqIfExists(WalletManageEntity::getUserId, dto.getUserId())
                 .eqIfExists(WalletManageEntity::getWalletTypeId, dto.getWalletTypeId())
                 .eqIfExists(WalletManageEntity::getIsFreeze, dto.getIsFreeze())
-                .likeIfExists(WalletManageEntity::getCardNumber, dto.getCardNumber());
+                .likeIfExists(WalletManageEntity::getCardNumber, dto.getCardNumber())
+                .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletManageEntity::getUserId, dto.getUserIds());
         return selectJoinPage(page, WalletManageVo.class, wrapper);
     }
 }
\ No newline at end of file