fix

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

@@ -43,6 +43,7 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.qo.DepartmentAddQO;
 import com.gic.haoban.manage.web.qo.DepartmentEditQO;
 import com.gic.haoban.manage.web.thread.SyncDepartmentThread;
+import com.gic.haoban.manage.web.vo.DepartmentVO;
 import com.gic.haoban.manage.web.vo.LoginVO;
 import com.gic.haoban.manage.web.vo.StoreVo;
 import com.gic.redis.data.util.RedisUtil;
@@ -149,7 +150,7 @@ public class DepartmentContoller extends WebBaseController{
 			departmentDTO.setHasSonNode(departmentApiService.hasSonNode(departmentDTO.getDepartmentId()));
 		}
 		
-		return resultResponse(HaoBanErrCode.ERR_1,list);
+		return resultResponse(HaoBanErrCode.ERR_1,,EntityUtil.changeEntityListByJSON(DepartmentVO.class, list));
 		
 	}
 	
@@ -512,7 +513,7 @@ public class DepartmentContoller extends WebBaseController{
 			}
 		}
 		
-		return resultResponse(HaoBanErrCode.ERR_1,dtoList);
+		return resultResponse(HaoBanErrCode.ERR_1,EntityUtil.changeEntityListByJSON(DepartmentVO.class, dtoList));
 		
 	}
 	

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

+package com.gic.haoban.manage.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class DepartmentVO implements Serializable{
+	
+	private String departmentId;
+
+    private String departmentName;
+
+    private String parentDepartmentId;
+
+    private String relatedId;
+
+    private Integer isStore;
+
+    private String wxDepartmentId;
+    
+    private Integer level;
+    
+    private Integer sort;
+    
+    private String wxEnterpriseId;
+    
+    private Integer type;
+    
+    private Integer bindFlag;
+    
+    private String gicEnterpriseName;
+    
+    private Boolean hasSonNode;
+
+	public String getDepartmentId() {
+		return departmentId;
+	}
+
+	public void setDepartmentId(String departmentId) {
+		this.departmentId = departmentId;
+	}
+
+	public String getDepartmentName() {
+		return departmentName;
+	}
+
+	public void setDepartmentName(String departmentName) {
+		this.departmentName = departmentName;
+	}
+
+	public String getParentDepartmentId() {
+		return parentDepartmentId;
+	}
+
+	public void setParentDepartmentId(String parentDepartmentId) {
+		this.parentDepartmentId = parentDepartmentId;
+	}
+
+	public String getRelatedId() {
+		return relatedId;
+	}
+
+	public void setRelatedId(String relatedId) {
+		this.relatedId = relatedId;
+	}
+
+	public Integer getIsStore() {
+		return isStore;
+	}
+
+	public void setIsStore(Integer isStore) {
+		this.isStore = isStore;
+	}
+
+	public String getWxDepartmentId() {
+		return wxDepartmentId;
+	}
+
+	public void setWxDepartmentId(String wxDepartmentId) {
+		this.wxDepartmentId = wxDepartmentId;
+	}
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+
+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
+
+	public String getWxEnterpriseId() {
+		return wxEnterpriseId;
+	}
+
+	public void setWxEnterpriseId(String wxEnterpriseId) {
+		this.wxEnterpriseId = wxEnterpriseId;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public Integer getBindFlag() {
+		return bindFlag;
+	}
+
+	public void setBindFlag(Integer bindFlag) {
+		this.bindFlag = bindFlag;
+	}
+
+	public String getGicEnterpriseName() {
+		return gicEnterpriseName;
+	}
+
+	public void setGicEnterpriseName(String gicEnterpriseName) {
+		this.gicEnterpriseName = gicEnterpriseName;
+	}
+
+	public Boolean getHasSonNode() {
+		return hasSonNode;
+	}
+
+	public void setHasSonNode(Boolean hasSonNode) {
+		this.hasSonNode = hasSonNode;
+	}
+    
+    
+
+}