ke
2024-12-03 bfe4e6e49ea341c8443d7b4b70cb66de0f1aadab
Merge remote-tracking branch 'origin/jtdev' into jtdev
3 files modified
5 ■■■■■ changed files
skjcmanager/skjcmanager-gateway/src/main/java/cn/gistack/gateway/provider/AuthProvider.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java 1 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-gateway/src/main/java/cn/gistack/gateway/provider/AuthProvider.java
@@ -41,6 +41,7 @@
        DEFAULT_SKIP_URL.add("/oauth/callback/**");
        DEFAULT_SKIP_URL.add("/oauth/revoke/**");
        DEFAULT_SKIP_URL.add("/oauth/refresh/**");
        DEFAULT_SKIP_URL.add("/oauth/tokenLogin/**");
        DEFAULT_SKIP_URL.add("/token/**");
//        DEFAULT_SKIP_URL.add("/actuator/**");
        DEFAULT_SKIP_URL.add("/v2/api-docs/**");
skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
@@ -160,6 +160,7 @@
     * 部门ID
     */
    private String deptId;
    private String othRegCd;
    /**
     * 是否单位过滤 1不过滤
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -91,6 +91,9 @@
        <if test="dto.adCode != null and dto.adCode !=''">
            and dria."county_cd" = #{dto.adCode}
        </if>
        <if test="dto.othRegCd != null and dto.othRegCd !=''">
            and dria."oth_reg_cd" = #{dto.othRegCd}
        </if>
       <if test="dto.projectSort == null">
            ORDER BY TO_NUMBER(info.project_progress) desc NULLS LAST,info.status desc
        </if>