智慧保安后台管理-外网项目备份
Administrator
2021-11-22 834f4b42af823fc58c43ce99e330dbeb2b98df5d
保安员查询接口调整,排序按id 倒序排序
3 files modified
9 ■■■■ changed files
src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java 1 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/accreditation/mapper/AccreditationRecordsMapper.xml
@@ -93,6 +93,7 @@
        <if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
            and sar.create_time &lt;= #{accreditationRecords.endTime}
        </if>
        order by sar.id desc
    </select>
    <!--自定义详情信息-->
@@ -208,6 +209,7 @@
        <if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
            and sar.create_time &lt;= #{accreditationRecords.endTime}
        </if>
        order by sar.id desc
    </select>
@@ -304,6 +306,7 @@
        <if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
            and sar.create_time &lt;= #{accreditationRecords.endTime}
        </if>
        order by sar.id desc
    </select>
@@ -400,6 +403,7 @@
        <if test="accreditationRecords.endTime!=null and accreditationRecords.endTime!='' and accreditationRecords.endTime!='undefined'">
            and sar.create_time &lt;= #{accreditationRecords.endTime}
        </if>
        order by sar.id desc
    </select>
    <!--根据用户 id 查询上岗证申请记录-->
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -88,6 +88,7 @@
        ITokenGranter granter = TokenGranterBuilder.getGranter(grantType);
        UserInfo userInfo = granter.grant(tokenParameter);
        if (null!=s && s.equals("")) {
            if (s.equals("0")) {
                return authInfo.set("error_description", "用户未审核");
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -133,7 +133,7 @@
        <if test="user.examinationType!=null and user.examinationType != ''">
            and bu.examination_type = #{user.examinationType}
        </if>
        ORDER BY bu.id
        ORDER BY bu.id desc
    </select>
    <select id="selectUserPage" resultMap="userResultMap">
@@ -190,7 +190,7 @@
        <if test="user.examinationType!=null and user.examinationType != ''">
            and examination_type = #{user.examinationType}
        </if>
        ORDER BY bu.id
        ORDER BY bu.id desc
    </select>
    <select id="getUser" resultMap="userResultMap">