bugfix

ruoyi-admin/src/main/resources/application-dev.yml

@@ -67,3 +67,9 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+
+# 日志配置
+logging:
+  level:
+    com.ruoyi: debug
+    org.springframework: debug

ruoyi-admin/src/main/resources/application-prod.yml

@@ -71,3 +71,9 @@ spring:
         wall:
           config:
             multi-statement-allow: true
+
+# 日志配置
+logging:
+  level:
+    com.ruoyi: error
+    org.springframework: error

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

@@ -34,11 +34,7 @@ server:
       # Tomcat启动初始化的线程数，默认值10
       min-spare: 100
 
-# 日志配置
+
-logging:
-  level:
-    com.ruoyi: debug
-    org.springframework: warn
 
 # 用户配置
 user:
@@ -55,7 +51,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid
+    active: prod
   # 文件上传
   servlet:
     multipart:

ruoyi-admin/src/main/resources/mapper/tcZz/netManage/ScreenMapper.xml

@@ -39,10 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getScreenArticles" resultType="com.ruoyi.tcZz.domain.reponse.ScreenArticlesResponse">
         SELECT *
-        FROM (SELECT COUNT(*) AS count FROM tc_wpwzlyqk where type =1 and isStatus=1) count,
+        FROM (SELECT COUNT(*) AS count FROM tc_wpwzlyqk where type = 1) count,
-	(SELECT COUNT(*) AS count1 FROM tc_wpwzlyqk where type=2 and isStatus=1 ) count1,
+             (SELECT COUNT(*) AS count1 FROM tc_wpwzlyqk where type = 2) count1,
-  (SELECT COUNT(*) AS count2 FROM tc_wpwzlyqk where type=3 and isStatus=1 ) count2;
+             (SELECT COUNT(*) AS count2 FROM tc_wpwzlyqk where type = 3) count2;
-
     </select>
 <!--    <select id="getScreenQinglang" resultType="com.ruoyi.tcZz.domain.reponse.ScreenQinglangWeifanResponse">-->
 <!--        select count1,date_time as dateTime from tc_qlzxxdsjtj-->

ruoyi-admin/src/main/resources/mapper/tcZz/networkSecurity/TcFbqkMapper.xml

@@ -26,12 +26,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cityName != null  and cityName != ''">and city_name like concat('%', #{cityName}, '%')</if>
             <if test="zb != null  and zb != ''">and zb = #{zb}</if>
             <if test="createBy != null  and createBy != ''">and create_by = #{createBy}</if>
-            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">
+                and create_time between #{params.beginCreateTime} and #{params.endCreateTime}
+            </if>
             <if test="updateBy != null  and updateBy != ''">and update_by = #{updateBy}</if>
-            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''"> and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}</if>
+            <if test="params.beginUpdateTime != null and params.beginUpdateTime != '' and params.endUpdateTime != null and params.endUpdateTime != ''">
+                and update_time between #{params.beginUpdateTime} and #{params.endUpdateTime}
+            </if>
             <if test="remark != null  and remark != ''">and remark = #{remark}</if>
         </where>
-        order by create_time desc
+        ORDER BY
+        CAST(zb AS DECIMAL ( 10, 2 )) DESC
     </select>
     
     <select id="selectTcFbqkById" parameterType="Long" resultMap="TcFbqkResult">