jz.kai 3 lat temu
rodzic
commit
86801c8b0e

+ 2 - 2
common/src/main/resources/mapper/base/WorkStation.xml

@@ -100,9 +100,9 @@ id_,area_id,station_name,del_flag,create_time,create_by,update_time,update_by		f
 	        ${sort.name} ${sort.order}
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	 	</foreach>
 	</select>
 	</select>
-	<select id="listByName" resultMap="WorkStationMap">
+	<select id="listByName" parameterType="string" resultMap="WorkStationMap">
 		select * from base_work_station
 		select * from base_work_station
 		where del_flag=0
 		where del_flag=0
-		and station_name={0}
+		and station_name=#{0}
 	</select>
 	</select>
 </mapper>
 </mapper>

+ 5 - 5
web/src/main/resources/application-dev.yml

@@ -5,12 +5,12 @@ server:
 
 
 spring:
 spring:
   datasource:
   datasource:
-    url: jdbc:log4jdbc:mysql://39.104.144.104:3308/double_excellent?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
-    username: root
-    password: jpsoft8121234
-#    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/double_excellent?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+#    url: jdbc:log4jdbc:mysql://39.104.144.104:3308/double_excellent?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 #    username: root
 #    username: root
-#    password: jpsoft2016
+#    password: jpsoft8121234
+    url: jdbc:log4jdbc:mysql://192.168.33.20:3306/double_excellent?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    username: root
+    password: jpsoft2016
   devtools:
   devtools:
     add-properties: false
     add-properties: false
     restart:
     restart: