From 62a4eac9102f8df2070aa78958e950ee20427d1f Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 16 Jan 2025 12:07:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=85=A8=E5=B1=80=E4=BA=BA=E8=84=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java    | 2 ++
 .../bsd/pjcloud/admin/controller/SysUserFaceController.java   | 2 +-
 .../java/com/bsd/pjcloud/admin/mapper/SysUserFaceMapper.java  | 3 +++
 .../pjcloud/admin/service/impl/SysUserFaceServiceImpl.java    | 4 ++--
 .../src/main/resources/mapper/SysUserFaceMapper.xml           | 4 +++-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java
index 3d1ead735..d222f1957 100644
--- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java
+++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/SysUserFaceDto.java
@@ -16,4 +16,6 @@ public class SysUserFaceDto extends SysUserFaceEntity {
 
     private String isGlobalFace;
 
+    private Long merchantDeptIdOrGlobal;
+
 }
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserFaceController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserFaceController.java
index 8af7d551f..51393634a 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserFaceController.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserFaceController.java
@@ -88,7 +88,7 @@ public class SysUserFaceController {
     public R adFinFace(@ParameterObject Page page, @RequestParam(required = false) Long userId, @RequestParam(required = false) Long merchantDeptId) {
         SysUserFaceDto dto = new SysUserFaceDto();
         dto.setUserId(userId);
-        dto.setMerchantDeptId(merchantDeptId);
+        dto.setMerchantDeptIdOrGlobal(merchantDeptId);
         return R.ok(sysUserFaceService.pageJoin(page, dto).getRecords());
     }
     /* ************************************* start android start ************************************* */
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserFaceMapper.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserFaceMapper.java
index f192af6ce..600415087 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserFaceMapper.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserFaceMapper.java
@@ -46,6 +46,9 @@ public interface SysUserFaceMapper extends PjcloudBaseMapper<SysUserFaceEntity>
                 .eq(ObjectUtil.isNotEmpty(dto.getUserId()), SysUserFaceEntity::getUserId, dto.getUserId())
                 .in(ObjectUtil.isNotEmpty(dto.getUserIds()), SysUserFaceEntity::getUserId, dto.getUserIds())
                 .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), SysUser::getDeptId, dto.getDeptIds());
+        if (ObjectUtil.isNotEmpty(dto.getMerchantDeptIdOrGlobal()) && ObjectUtil.isNotEmpty(dto.getDeptIds())) {
+            wrapper.and(v -> v.in(ObjectUtil.isNotEmpty(dto.getDeptIds()), SysUser::getDeptId, dto.getDeptIds()).or().eq(SysUser::getIsGlobalFace, true));
+        }
         return selectJoinPage(page, SysUserFaceVo.class, wrapper);
     }
 }
\ No newline at end of file
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java
index 84d21c3de..1cf82afc9 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/service/impl/SysUserFaceServiceImpl.java
@@ -101,8 +101,8 @@ public class SysUserFaceServiceImpl extends ServiceImpl<SysUserFaceMapper, SysUs
 
     @Override
     public Page<SysUserFaceVo> pageJoin(Page page, SysUserFaceDto dto) {
-        if (ObjectUtil.isNotEmpty(dto.getMerchantDeptId())) {
-            List<SysDept> deptList = sysDeptService.listDescendant(dto.getMerchantDeptId());
+        if (ObjectUtil.isNotEmpty(dto.getMerchantDeptIdOrGlobal())) {
+            List<SysDept> deptList = sysDeptService.listDescendant(dto.getMerchantDeptIdOrGlobal());
             if (ObjectUtil.isNotEmpty(deptList)) {
                 List<Long> deptIds = deptList.stream().map(SysDept::getDeptId).toList();
                 dto.setDeptIds(deptIds);
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml
index c787a9970..d9372a10b 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserFaceMapper.xml
@@ -29,11 +29,13 @@
         <if test="pa.userId != null">
             and a.user_id = #{pa.userId}
         </if>
+        <if test="pa.userId != null">
+        </if>
     </sql>
 
     <select id="scopePageList" resultType="com.bsd.pjcloud.admin.api.vo.SysUserFaceVo">
         <include refid="selectA"/>
-        u.username,
+        u.name as username,
         u.avatar as userAvatar,
         u.phone as userMobile
         from sys_user_face a