智慧保安后台管理-外网项目备份
guoshilong
2024-01-09 9cec241f48b6eb05596bf5f5202a9797f661773a
添加证书申请审核状态
3 files modified
19 ■■■■■ changed files
src/main/java/org/springblade/common/config/BladeConfiguration.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml 15 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/vo/UserVO.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/common/config/BladeConfiguration.java
@@ -94,6 +94,7 @@
        secureRegistry.excludePathPatterns("/signInRecords/signSituation/bar");
        secureRegistry.excludePathPatterns("/signInRecords/signSituation/list");
        secureRegistry.excludePathPatterns("/examScore/getList");
        secureRegistry.excludePathPatterns("//userWx/wxRegister");
        return secureRegistry;
    }
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -45,6 +45,7 @@
        <result column="healstats" property="healstats"/>
        <result column="soil" property="soil"/>
        <result column="reason_for_leav" property="reasonForLeav"/>
        <result column="accreditationStatus" property="accreditationStatus"/>
    </resultMap>
    <!--带坐标-->
@@ -56,7 +57,8 @@
        sll.longitude,sll.latitude,
        bud.unit_name,
        bud.permanent_residence_address as registered,
        bd.dept_name
        bd.dept_name,
        CASE WHEN sar.audit_status is not null THEN sar.audit_status ELSE -1 END AS accreditationStatus
        from
        blade_user bu
        left join blade_user_detail bud on bud.user_id = bu.id
@@ -66,7 +68,18 @@
        left join sys_live_location sll on sll.worker_id = bu.id
        left join blade_role br on br.id = bu.role_id
        left join sys_training_registration str on bu.id = str.user_id
        LEFT JOIN sys_accreditation_records sar ON sar.user_id = bu.id
        where bu.is_deleted = 0
        <if test="user.accreditationStatus != null and user.accreditationStatus != ''">
            <if test="user.accreditationStatus == -1">
                AND sar.audit_status is null
            </if>
            <if test="user.accreditationStatus != -1">
                AND sar.audit_status = #{user.accreditationStatus}
            </if>
        </if>
        <if test="user.examinationType!=null and user.examinationType != ''">
            <if test="user.examinationType == 0">
                and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type ='')
src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -187,4 +187,7 @@
    private String unitName;
    private String registered;
    //证书申请状态
    private String accreditationStatus;
}