diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/UserDTO.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/UserDTO.java index eb9b87f65..a61771bda 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/UserDTO.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/UserDTO.java @@ -102,4 +102,10 @@ public class UserDTO extends SysUser implements BaseIsIncludeTreeInterface { */ private Boolean isFindCheckUser = false; + /** + * 是否已录入人脸:1=已录入(存在未删除人脸记录),0=未录入 + */ + @Schema(description = "是否已录入人脸:1已录入 0未录入") + private String hasFace; + } 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 2038232cf..ef0869dbc 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 @@ -234,6 +234,23 @@ AND u.lock_flag = #{query.lockFlag} + + + + + AND EXISTS ( + SELECT 1 FROM sys_user_face f + WHERE f.user_id = u.user_id AND f.del_flag = '0' + ) + + + AND NOT EXISTS ( + SELECT 1 FROM sys_user_face f + WHERE f.user_id = u.user_id AND f.del_flag = '0' + ) + + + and urole.role_id IN @@ -351,6 +368,22 @@ AND u.lock_flag = #{query.lockFlag} + + + + AND EXISTS ( + SELECT 1 FROM sys_user_face f + WHERE f.user_id = u.user_id AND f.del_flag = '0' + ) + + + AND NOT EXISTS ( + SELECT 1 FROM sys_user_face f + WHERE f.user_id = u.user_id AND f.del_flag = '0' + ) + + + AND u.phone LIKE #{phoneLike}