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

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

 package com.gic.haoban.manage.web.controller;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -51,15 +52,19 @@ public class EnterpriseController extends WebBaseController{
 	@Autowired
 	private EnterpriseService enterpriseService;
 //	@Autowired
-//	private WxEnterpriseRelatedApiService wxEnterpriseRelatedApiService;
+//	private WxEnterpriseRelatedApiService wxEnterpriseRelllatedApiService;
 	//企业列表
 	@RequestMapping("wx-enterprise-list")
 	public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo,String keyword,String gicEnterpriseName,Integer gicContactHelper,String version) {
 		List<EnterpriseDTO> enterpriseNames = enterpriseService.getEnterpriseByName(gicEnterpriseName);
-		List<String>enterpriseIds = enterpriseNames.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList());
-		List<EnterpriseDetailDTO> wxEnterpriseIdDTOs = wxEnterpriseRelatedApiService.listEnterpriseByEnterpriseIds(enterpriseIds);
-		List<String> wxEnterpriseIds = wxEnterpriseIdDTOs.stream().map(s->s.getWxEnterpriseId()).collect(Collectors.toList());
-		
+		List<String> wxEnterpriseIds = new ArrayList<String>();
+		if(CollectionUtil.isNotEmpty(enterpriseNames)){
+			List<String>enterpriseIds = enterpriseNames.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList());
+			List<EnterpriseDetailDTO> wxEnterpriseIdDTOs = wxEnterpriseRelatedApiService.listEnterpriseByEnterpriseIds(enterpriseIds);
+			if(CollectionUtil.isNotEmpty(wxEnterpriseIdDTOs)){
+				wxEnterpriseIds = wxEnterpriseIdDTOs.stream().map(s->s.getWxEnterpriseId()).collect(Collectors.toList());
+			}
+		}
 		Page<YwWxEnterpriseDTO> page = wxEnterpriseApiService.list(pageInfo,keyword,wxEnterpriseIds,gicContactHelper,version);
 		PageResult<YwWxEnterpriseDTO> pageVo = new PageResult<>();
 		List<YwWxEnterpriseDTO> list = EntityUtil.changeEntityListByJSON(YwWxEnterpriseDTO.class, page.getResult());

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

@@ -250,7 +250,7 @@ public class BindApiServiceImpl implements BindApiService {
 		for(ClerkDTO clerkDTO :list){
 			clerkDTO.setPhoneNumber(staffDTO.getPhoneNumber());
 			clerkDTO.setClerkName(staffDTO.getStaffName());
-			clerkDTO.setHeadImgUrl(StringUtils.isEmpty(staffDTO.getHeadImg())?"--":staffDTO.getHeadImg());
+			clerkDTO.setHeadImgUrl(StringUtils.isEmpty(staffDTO.getHeadImg())?"":staffDTO.getHeadImg());
 			clerkService.updateClerk(clerkDTO);
 		}		
 	}

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

@@ -44,6 +44,7 @@ public class StoreController extends WebBaseController{
         page.setPageSize(basePageInfo.getPageSize());
         StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
         storeSearchDTO.setEnterpriseId(enterpriseId);
+        storeSearchDTO.setStatus("2");
         Page<StoreDTO> resultPage = storeService.storeListPage(page, storeSearchDTO);
         List<StoreDTO> resultList = resultPage.getResult();
 		PageResult<StoreDTO> pageVo = new PageResult<>();

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

@@ -294,6 +294,9 @@ public class StoreController extends WebBaseController{
 		vo.setClerkCode(staffDepartmentRelatedDTO.getClerkCode());
 		vo.setBindFlag(StringUtils.isEmpty(staffDepartmentRelatedDTO.getClerkCode())?0:1);
 		vo.setAuditDetail(list);
+		
+		AuditSettingDTO auditSettingDTO = auditSettingApiService.findSettingByWxEnterpriseId(staffDepartmentRelatedDTO.getWxEnterpriseId());
+		vo.setAuditFlag(auditSettingDTO == null?0:auditSettingDTO.getAuditFlag());
 		return resultResponse(HaoBanErrCode.ERR_1,vo);
 	}
 	

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

@@ -41,6 +41,16 @@ public class StoreDetailVO implements Serializable {
 
     private Object auditDetail;
     
+    private Integer auditFlag = 0;
+
+	public Integer getAuditFlag() {
+		return auditFlag;
+	}
+
+	public void setAuditFlag(Integer auditFlag) {
+		this.auditFlag = auditFlag;
+	}
+
 	public Object getAuditDetail() {
 		return auditDetail;
 	}