diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
index a346cc404..9df7f6e24 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
@@ -71,6 +71,8 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 	@Autowired
 	private RedisCache redisCache;
 
+
+
 	/**
 	 * 查询充电站信息
 	 *
@@ -134,6 +136,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 			// vo.setOrganizationCode(pileStationInfo.getor);
 			vo.setPublicFlag(pileStationInfo.getPublicFlag());
 			vo.setOpenFlag(pileStationInfo.getOpenFlag());
+			vo.setDeptId(pileStationInfo.getDeptId());
 			if (StringUtils.isNotBlank(pileStationInfo.getPictures())) {
 				vo.setPictures(pileStationInfo.getPictures());
 				vo.setPictureList(Lists.newArrayList(pileStationInfo.getPictures().split(",")));
@@ -255,6 +258,9 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
 		redisCache.deleteObject(redisKey);
 		pileStationInfo.setUpdateBy(SecurityUtils.getUsername());
 		pileStationInfo.setUpdateTime(DateUtils.getNowDate());
+		// 同步组织中的名称，联系人，电话
+		// sysDeptService.updateDept()
+
 		return pileStationInfoMapper.updatePileStationInfo(pileStationInfo);
 	}
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
index 7eb515ac7..34f28f894 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
@@ -29,6 +29,11 @@ public class PileStationVO {
      */
     private String stationName;
 
+    /**
+     * 组织id
+     */
+    private String deptId;
+
     /**
      * 省市辖区编码
      */
diff --git a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
index 88011f936..b1f393387 100644
--- a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
+++ b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
@@ -292,6 +292,7 @@ export default {
         ],
       },
       fileList: [], // 用于图片回显
+      dialogVisible: null,
     };
   },
   created() {
@@ -324,9 +325,11 @@ export default {
       const res = await getStationInfo(this.stationId);
       console.log(res);
       this.station = res.data;
-      var pictures = res.data.pictures.split(',');
-      for (let i = 0; i < pictures.length; i++) {
-        this.fileList.push({"url": pictures[i]});
+      if (res.data.pictures != null) {
+        var pictures = res.data.pictures.split(',');
+        for (let i = 0; i < pictures.length; i++) {
+          this.fileList.push({"url": pictures[i]});
+        }
       }
       console.log("queryStationInfo表格数据", this.station);
     },