111

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/DepartmentContoller.java

@@ -357,8 +357,9 @@ public class DepartmentContoller extends WebBaseController{
 		Map<String,StoreDTO> map = com.gic.commons.util.CollectionUtil.toMap(storeList, "storeId");
 		
 		for(StoreVo vo:resultList){
-			if(map.get(vo.getDepartmentId())!=null){
+			if(map.get(vo.getRelatedId())!=null){
 				vo.setStoreCode(map.get(vo.getDepartmentId()).getStoreCode());
+				vo.setStoreId(map.get(vo.getDepartmentId()).getStoreId());
 			}
 		}
 		

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/StoreVo.java

@@ -16,6 +16,14 @@ public class StoreVo implements Serializable {
     private String departmentName;
     private String storeId;
     private String storeCode;
+    private String relatedId;
+    
+	public String getRelatedId() {
+		return relatedId;
+	}
+	public void setRelatedId(String relatedId) {
+		this.relatedId = relatedId;
+	}
 	public String getDepartmentId() {
 		return departmentId;
 	}