feat:全局人脸

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;
+
 }

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 ************************************* */

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);
     }
 }

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);

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