经验交流代码提交

qianhe-admin/src/main/resources/application.yml

@@ -134,6 +134,6 @@ xss:
   # 过滤开关
   # 过滤开关
   enabled: true
   enabled: true
   # 排除链接（多个用逗号分隔）
   # 排除链接（多个用逗号分隔）
-  excludes: /system/notice
+  excludes: /system/notice,/system/wzgl
   # 匹配链接
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
   urlPatterns: /system/*,/monitor/*,/tool/*

qianhe-ydsj/src/main/java/com/qianhe/controller/JygxSyController.java

@@ -43,6 +43,7 @@ public class JygxSyController extends BaseController
     @GetMapping("/wzgllist")
     @GetMapping("/wzgllist")
     public TableDataInfo list(JygxWzgl jygxWzgl)
     public TableDataInfo list(JygxWzgl jygxWzgl)
     {
     {
+        startPage();
         jygxWzgl.setShzt("4");
         jygxWzgl.setShzt("4");
         List<JygxWzgl> list = jygxWzglService.selectList(jygxWzgl);
         List<JygxWzgl> list = jygxWzglService.selectList(jygxWzgl);
         return getDataTable(list);
         return getDataTable(list);

qianhe-ydsj/src/main/resources/mapper/JygxCljwhMapper.xml

@@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tzfs != null  and tzfs != ''"> and tzfs = #{tzfs}</if>
             <if test="tzfs != null  and tzfs != ''"> and tzfs = #{tzfs}</if>
             <if test="fbzt != null  and fbzt != ''"> and fbzt = #{fbzt}</if>
             <if test="fbzt != null  and fbzt != ''"> and fbzt = #{fbzt}</if>
         </where>
         </where>
+        ORDER BY ifnull (px,999999) desc
     </select>
     </select>
 
 
     <select id="selectJygxCljwhByCljid" parameterType="Long" resultMap="JygxCljwhResult">
     <select id="selectJygxCljwhByCljid" parameterType="Long" resultMap="JygxCljwhResult">

qianhe-ydsj/src/main/resources/mapper/JygxYyxtwhMapper.xml

@@ -43,6 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
             <if test="yl5 != null  and yl5 != ''"> and yl5 = #{yl5}</if>
             <if test="fbzt != null  and fbzt != ''"> and fbzt = #{fbzt}</if>
             <if test="fbzt != null  and fbzt != ''"> and fbzt = #{fbzt}</if>
         </where>
         </where>
+
+        ORDER BY ifnull (px,999999) desc
     </select>
     </select>
 
 
     <select id="selectJygxYyxtwhByYyxtid" parameterType="Long" resultMap="JygxYyxtwhResult">
     <select id="selectJygxYyxtwhByYyxtid" parameterType="Long" resultMap="JygxYyxtwhResult">