Merge remote-tracking branch 'origin/developer' into developer

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/dao/mapper/WxEnterpriseRelatedMapper.java

@@ -2,6 +2,8 @@ package com.gic.haoban.manage.service.dao.mapper;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterpriseRelated;
 
 public interface WxEnterpriseRelatedMapper {
@@ -23,6 +25,6 @@ public interface WxEnterpriseRelatedMapper {
 
 	List<TabHaobanWxEnterpriseRelated> queryAllHasGicEnterpriseId();
 	
-	List<TabHaobanWxEnterpriseRelated> listEnterpriseByEnterpriseIds(List<String> enterpriseIds);
+	List<TabHaobanWxEnterpriseRelated> listEnterpriseByEnterpriseIds(@Param("enterpriseIds")List<String> enterpriseIds);
 
 }
\ No newline at end of file

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

@@ -449,11 +449,12 @@ public class StaffApiServiceImpl implements StaffApiService {
 						//if(!staffDTO.getPhoneNumber().equals(related.getPhoneNumber())||!staffDTO.getStaffName().equals(clerkDTO.getStaffName())){
 						String headPic = staffDTO.getHeadImg();
 						if(clerkDTO != null && (!clerkDTO.getClerkName().equals(staffName) || !staffDTO.getPhoneNumber().equals(clerkDTO.getPhoneNumber())) 
-								|| (org.apache.commons.lang3.StringUtils.isNotBlank(headPic) && !headPic.equals(clerkDTO.getHeadImgUrl()))){
+								|| (org.apache.commons.lang3.StringUtils.isNotBlank(headPic) && !headPic.equals(clerkDTO.getImageUrl()))){
 							logger.info("【员工修改】clerkDTO={}",JSON.toJSONString(clerkDTO));
 							clerkDTO.setClerkName(staffDTO.getStaffName());
 							clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
-							clerkDTO.setHeadImgUrl(staffDTO.getHeadImg());
+							//clerkDTO.setHeadImgUrl(staffDTO.getHeadImg());
+							clerkDTO.setImageUrl(staffDTO.getHeadImg());
 							clerkService.updateClerk(clerkDTO);
 						}
 						//}

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-web/src/main/java/com/gic/haoban/manage/web/controller/ApplicationController.java

@@ -57,6 +57,12 @@ public class ApplicationController extends WebBaseController{
 	private ApplicationSettingApiService applicationSettingApiService;
 	
 	@RequestMapping("application-list")
+	public HaobanResponse applicationList() {
+		List<ApplicationDTO> list = applicationApiService.listApplication();
+		return resultResponse(HaoBanErrCode.ERR_1,list);
+	}
+	@IgnoreLogin
+	@RequestMapping("application-open-close-list")
 	public HaobanResponse applicationList(String wxEnterpriseId) {
 		Map<String,Object> map = new HashMap<>();
 		List<ApplicationDTO> list = applicationApiService.listApplication();

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);
 	}