Merge branch 'master' of https://gitea.zianxin.com/zax/biz-api-cloud-zax

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

pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -234,6 +234,23 @@
             <if test="query.lockFlag != null and query.lockFlag != ''">
                 AND u.lock_flag = #{query.lockFlag}
             </if>
+            <!-- 已录入：存在未删除人脸；未录入：无未删除人脸（与列表「人脸」列数据源一致） -->
+            <if test="query.hasFace != null and query.hasFace != ''">
+                <choose>
+                    <when test='query.hasFace == "1"'>
+                        AND EXISTS (
+                            SELECT 1 FROM sys_user_face f
+                            WHERE f.user_id = u.user_id AND f.del_flag = '0'
+                        )
+                    </when>
+                    <when test='query.hasFace == "0"'>
+                        AND NOT EXISTS (
+                            SELECT 1 FROM sys_user_face f
+                            WHERE f.user_id = u.user_id AND f.del_flag = '0'
+                        )
+                    </when>
+                </choose>
+            </if>
             <if test="query.role != null and query.role.size() != 0">
                 and urole.role_id IN
                 <foreach collection="query.role" item="v" open="(" close=")" separator=",">
@@ -351,6 +368,22 @@
             <if test="query.lockFlag != null and query.lockFlag != ''">
                 AND u.lock_flag = #{query.lockFlag}
             </if>
+            <if test="query.hasFace != null and query.hasFace != ''">
+                <choose>
+                    <when test='query.hasFace == "1"'>
+                        AND EXISTS (
+                            SELECT 1 FROM sys_user_face f
+                            WHERE f.user_id = u.user_id AND f.del_flag = '0'
+                        )
+                    </when>
+                    <when test='query.hasFace == "0"'>
+                        AND NOT EXISTS (
+                            SELECT 1 FROM sys_user_face f
+                            WHERE f.user_id = u.user_id AND f.del_flag = '0'
+                        )
+                    </when>
+                </choose>
+            </if>
             <if test="query.phone != null and query.phone != ''">
                 <bind name="phoneLike" value="'%'+query.phone+'%'"/>
                 AND u.phone LIKE #{phoneLike}