Browse Source

修改bug

JX.Li 1 year ago
parent
commit
0a43762f8c

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

@@ -57,12 +57,12 @@ spring:
 #          url: jdbc:mysql://123.249.30.140:3307/gas?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
 #          username: root
 #          password: szrqwx123456
-#          url: jdbc:mysql://49.232.253.249:3306/sj_zdsz_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-#          username: root
-#          password: Lanyuxinxi@88.com
-          url: jdbc:mysql://121.37.40.217:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
-          username: zdsz
-          password: ZDSZ1a2b3c4d%...
+          url: jdbc:mysql://49.232.253.249:3306/zdsz_xx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          username: root
+          password: Lanyuxinxi@88.com
+#          url: jdbc:mysql://121.37.40.217:13306/zdsz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true
+#          username: zdsz
+#          password: ZDSZ1a2b3c4d%...
 #          szrqwx123456
         # 从库数据源
         slave:

+ 2 - 2
ruoyi-gas/src/main/resources/mapper/GAreaMapper.xml

@@ -31,9 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT za.name AS areaName,
                sd.dict_label AS district,
                zb.name AS buildName
-        FROM z_area za
+        FROM g_area za
                  LEFT JOIN sys_dict_data sd on sd.dict_type = 'district' and za.district = sd.dict_value
-                 LEFT JOIN z_building zb on zb.area_id = za.id and zb.del_flag = 0
+                 LEFT JOIN g_building zb on zb.area_id = za.id and zb.del_flag = 0
         WHERE za.del_flag = 0
         order by za.create_time desc
     </select>

+ 3 - 0
ruoyi-gas/src/main/resources/mapper/GCourtyardNetworkManagementMapper.xml

@@ -38,6 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.findProblem != null  and p.findProblem != ''">
                 and a.find_problem = #{p.findProblem}
             </if>
+            <if test="p.createBy != null  and p.createBy != ''">
+                and a.create_by = #{p.createBy}
+            </if>
         </where>
         ORDER BY a.create_time DESC
     </select>

+ 3 - 0
ruoyi-gas/src/main/resources/mapper/GRegulatorBoxMapper.xml

@@ -75,6 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.number != null  and p.number != ''">
                 and a.number = #{p.number}
             </if>
+            <if test="p.createBy != null  and p.createBy != ''">
+                and a.create_by = #{p.createBy}
+            </if>
         </where>
         ORDER BY a.create_time DESC
     </select>