Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -27,12 +27,21 @@ public class QywxCallBackDTO implements Serializable{
     private String departmentName;
     private Integer parentId;
     private Integer order;
+    private String avatar;//头像
     /**部门创建：create_party；部门修改：update_party；部门删除：delete_party*
      * 成员创建：create_user；成员修改：update_user；成员删除：delete_user*/
     private String changeType;
     
     private String avatar;
 
+    public String getAvatar() {
+        return avatar;
+    }
+
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
+    }
+
     public String getSuiteId() {
         return suiteId;
     }

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

@@ -97,7 +97,9 @@ public class EnterpriseController extends WebBaseController{
 				List<DepartmentDTO> countList = departmentApiService.listByRelatedIds(storeIds);
 				vo.setStoreCount(countList.size());
 			}
-			
+			EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(vo.getEnterpriseId());
+			vo.setEnterpriseName(enterpriseDTO.getEnterpriseName());
+			vo.setEnterpriseLogo(enterpriseDTO.getQcloudImageUrl());
 		}
 		return resultResponse(HaoBanErrCode.ERR_1,result);
 	}

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

@@ -14,7 +14,15 @@ public class EnterpriseDetailVo implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private String enterpriseId;
     private String enterpriseName;
+    private String EnterpriseLogo;
     private Integer storeCount = 0;
+    
+	public String getEnterpriseLogo() {
+		return EnterpriseLogo;
+	}
+	public void setEnterpriseLogo(String enterpriseLogo) {
+		EnterpriseLogo = enterpriseLogo;
+	}
 	public String getEnterpriseId() {
 		return enterpriseId;
 	}

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/WxEnterpriseRelatedApiServiceImpl.java

@@ -9,7 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.gic.commons.util.EntityUtil;
+import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.dto.GicTreeDTO;
+import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.enterprise.api.service.StoreGroupService;
 import com.gic.haoban.common.utils.UuidUtil;
 import com.gic.haoban.manage.api.dto.EnterpriseDetailDTO;
@@ -29,7 +31,6 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 	private WxEnterpriseRelatedMapper wxEnterpriseRelatedMapper;
 	@Autowired
 	private WxEnterpriseRelatedService wxEnterpriseRelatedService;
-	
 	@Autowired
 	private StoreGroupService storeGroupService;
 	@Autowired

haoban-manage3-service/src/main/resources/mapper/DepartmentMapper.xml

@@ -317,7 +317,7 @@
     <include refid="Base_Column_List" />
     from tab_haoban_department
     where status_flag = 1
-    and   is_store = #{storeFlag,jdbcType=INTEGER}
+    and   is_store = 1
     <if test="relatedIds != null and relatedIds.size() > 0">
     	and related_id IN 
 	    <foreach collection="relatedIds" item="id" index="index" open="(" close=")" separator=",">

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

@@ -297,6 +297,9 @@ public class StoreController extends WebBaseController{
 		
 		AuditSettingDTO auditSettingDTO = auditSettingApiService.findSettingByWxEnterpriseId(staffDepartmentRelatedDTO.getWxEnterpriseId());
 		vo.setAuditFlag(auditSettingDTO == null?0:auditSettingDTO.getAuditFlag());
+		if(vo.getStoreArea() != null&&vo.getStoreArea()==-1 ){
+			vo.setStoreArea(null);
+		}
 		return resultResponse(HaoBanErrCode.ERR_1,vo);
 	}