修改连接及小bug

.gitignore

@@ -4,3 +4,4 @@
 WebContent/WEB-INF/classes/
 
 *.iml
+WebContent/pic/251491.png

src/config/jdbc.properties

@@ -1,5 +1,5 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://192.168.2.118:3306/gxwss?useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://192.168.1.162:3306/gxwss?useUnicode=true&characterEncoding=utf-8
 
 jdbc.url.mysql=jdbc:mysql://127.0.0.1:3306/gxwss?user=root&password=root&useUnicode=true&characterEncoding=utf-8
 

src/java/com/bus/web/BusInitController.java

@@ -1467,8 +1467,10 @@ public class BusInitController extends BaseController {
             //关联用水性质
             for (BusAnnualPlanForWater item0:list){
                 BusOrg org = item0.getOrg();
-                if (org!=null){
+                if (org!=null && org.getPropertiesId()!=null){
+
                     BaseWaterProperties properties = baseWaterPropertiesService.get(org.getPropertiesId());
+
                     org.setPropertiesInfo(properties);
                 }
             }