1.统计接口调整

tangzy

2021-08-17 b2e6bc84d81a75784e89b124ca7b403c9ac19ae7

 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -39,12 +39,11 @@
        <result column="hold" property="hold"/>
        <result column="jurisdiction" property="jurisdiction"/>
        <result column="securitynumber" property="securitynumber"/>
        <result column="examination_type" property="examinationType"/>
        <result column="examination_mx" property="examinationMx"/>
        <result column="fingerprint" property="fingerprint"/>
        <result column="photo" property="photo"/>
        <result column="dispatch" property="dispatch"/>
        <result column="my_picture" property="myPicture"/>
        <result column="soil" property="soil"/>
    </resultMap>


@@ -111,6 +110,9 @@
        <if test="user.nativeplace!=null and user.nativeplace != ''">
            and nativeplace = #{user.nativeplace}
        </if>
        <if test="user.examinationType!=null and user.examinationType != ''">
            and examination_type = #{user.examinationType}
        </if>
        <if test="user.sex!=null and user.sex != ''">
            and sex = #{user.sex}
        </if>
@@ -156,12 +158,6 @@
            bu.is_deleted = 0
        and
            bd.dept_category = 1
        <if test="user.tenantId!=null and user.tenantId != ''">
            and bu.tenant_id = #{user.tenantId}
        </if>
        <if test="user.account!=null and user.account != ''">
            and bu.account != #{user.account}
        </if>
        <if test="user.cardid!=null and user.cardid != ''">
            and bu.cardid like concat(concat('%', #{user.cardid}),'%')
        </if>
@@ -187,19 +183,6 @@
        </if>
        <if test="user.securitynumber!=null and user.securitynumber != ''">
            and bu.securitynumber = #{user.securitynumber}
        </if>
        <if test="deptIdList!=null and deptIdList.size>0">
            and id in (
                SELECT
                    user_id
                FROM
                    blade_user_dept
                WHERE
                dept_id IN
                <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            )
        </if>
        <if test="user.useName==null or user.useName==''">
            order by bu.id
@@ -236,4 +219,10 @@
        select id,cardid from blade_user where is_deleted = 0
    </select>

    <!--查询用户数据,未删除的,未审核的-->
    <select id="getNotAuditAllUserList" resultType="org.springblade.modules.system.entity.User">
        select id,cardid from blade_user where is_deleted = 0
         and (examination_type!='0' or examination_type is null)
    </select>

</mapper>