fix

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/EnterpriseDetailDTO.java

@@ -21,6 +21,7 @@ public class EnterpriseDetailDTO implements Serializable{
 	private String staffId;
 	private String staffName;
 	private Date createTime;
+	private String brandName;
 	public String getWxEnterpriseRelatedId() {
 		return wxEnterpriseRelatedId;
 	}
@@ -81,6 +82,12 @@ public class EnterpriseDetailDTO implements Serializable{
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
+	public String getBrandName() {
+		return brandName;
+	}
+	public void setBrandName(String brandName) {
+		this.brandName = brandName;
+	}
 	
 	
 }

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

@@ -27,6 +27,7 @@ import com.gic.haoban.manage.web.anno.IgnoreLogin;
 import com.gic.haoban.manage.web.auth.AuthRequestUtil;
 import com.gic.haoban.manage.web.config.Config;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
+import com.gic.haoban.manage.web.vo.EnterpriseSearchVO;
 import com.gic.haoban.manage.web.vo.LoginVO;
 import com.gic.haoban.manage.web.vo.SecretSettingVO;
 import com.gic.haoban.manage.web.vo.StoreVo;
@@ -85,6 +86,7 @@ public class WxEnterpriseController extends WebBaseController{
 				if(enterpriseDTO!=null){
 					dto.setEnterpriseName(enterpriseDTO.getEnterpriseName());
 					dto.setEnterpriseLogo(enterpriseDTO.getQcloudImageUrl());
+					dto.setBrandName(enterpriseDTO.getBrandName());
 				}
 			}
 		}
@@ -139,6 +141,14 @@ public class WxEnterpriseController extends WebBaseController{
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}
 		EnterpriseAndUserDTO dto = enterpriseService.getEnterpriseAndUserByName(enterpriseName);
+		EnterpriseSearchVO vo = EntityUtil.changeEntityByJSON(EnterpriseSearchVO.class, dto);
+		if(vo != null){
+			String enterpriseId = vo.getEnterpriseId();
+			EnterpriseDTO enterprise = enterpriseService.getEnterpriseByEid(enterpriseId);
+			if(enterprise != null){
+				vo.setBrandName(enterprise.getBrandName());
+			}
+		}
 		return resultResponse(HaoBanErrCode.ERR_1,dto);
  
 	}

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

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+
+public class EnterpriseSearchVO implements Serializable{
+	
+	private String enterpriseId;
+    private String enterpriseName;
+    private String clerkId;
+    private String clerkCode;
+    private String clerkName;
+    private String phoneNumber;
+    private String nationCode;
+    private String brandName;
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(String clerkId) {
+        this.clerkId = clerkId;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public String getNationCode() {
+        return nationCode;
+    }
+
+    public void setNationCode(String nationCode) {
+        this.nationCode = nationCode;
+    }
+
+	public String getBrandName() {
+		return brandName;
+	}
+
+	public void setBrandName(String brandName) {
+		this.brandName = brandName;
+	}
+
+    
+}