111

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

@@ -71,6 +71,12 @@ public class StoreController extends WebBaseController{
 			VO.setStoreName(dto.getDepartmentName());
 			VO.setWxEnterpriseId(dto.getWxEnterpriseId());
 			VO.setStoreImg("");//先置空
+			if(org.apache.commons.lang.StringUtils.isNotBlank(dto.getRelatedId())){
+				StoreDTO storeDTO = storeService.getStore(dto.getRelatedId());
+				if(storeDTO != null ){
+					VO.setEnterpriseId(storeDTO.getEnterpriseId());
+				}
+			}
 			resultList.add(VO);
 		}
 		//2、获取关联表数据

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

@@ -14,12 +14,19 @@ public class StoreVO implements Serializable {
     private String staffId;
     private String storeName;
     private String wxEnterpriseId;
+    private String enterpriseId;
     private int bindFlag;
     private String staffDepartmentRelatedId;
     private String clerkCode;
     private String storeImg;
     private int clerkType;
 
+	public String getEnterpriseId() {
+		return enterpriseId;
+	}
+	public void setEnterpriseId(String enterpriseId) {
+		this.enterpriseId = enterpriseId;
+	}
 	public int getClerkType() {
 		return clerkType;
 	}