111

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

@@ -179,7 +179,7 @@
     from tab_haoban_staff_clerk_relation
     where staff_id = #{staffId,jdbcType=VARCHAR}
     and status_flag = 1
-    <if test="enterpriseIdList!=null && enterpriseIdList.size>0">
+    <if test="enterpriseIdList!=null && enterpriseIdList.size &gt; 0">
     and enterprise_id in 
     <foreach collection="enterpriseIdList" item="id" index="index" open="(" close=")" separator=",">
       #{id,jdbcType=VARCHAR}

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

@@ -21,6 +21,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.clerk.api.dto.ClerkDTO;
 import com.gic.clerk.api.dto.ClerkListDTO;
+import com.gic.clerk.api.service.ClerkNewService;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
@@ -93,7 +94,8 @@ public class ClerkController extends WebBaseController{
 	private AuditApiService auditApiService;
 	@Autowired
 	private StaffClerkRelationApiService staffClerkRelationApiService;
-	
+	@Autowired
+	private ClerkNewService clerkNewService;
 	
 	//导购列表
 	@RequestMapping("/clerk-list")
@@ -473,7 +475,7 @@ public class ClerkController extends WebBaseController{
 		}
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}
-	
+	//精确查，根据手机号或者code，查找
 	@RequestMapping("query-clerk-list-by-code")
 	public HaobanResponse queryClerkListByCode(String keyword,String wxEnterpriseId){
 		if(StringUtils.isAnyBlank(keyword,wxEnterpriseId)){
@@ -483,38 +485,30 @@ public class ClerkController extends WebBaseController{
 		if(list == null || list.isEmpty()){
 			return resultResponse(HaoBanErrCode.ERR_1);
 		}
-		
+		List<String> enterpriseIdList = list.stream().map(s->s.getEnterpriseId()).collect(Collectors.toList());
+		List<ClerkDTO> clerkList = clerkNewService.listClerkByEnterpriseIdAndSearch(enterpriseIdList,  keyword);
 		List<ClerkStoreVO> clerkStoreList = new ArrayList<>();
-		for (EnterpriseDetailDTO enterpriseDetailDTO : list) {
-			String enterpriseId = enterpriseDetailDTO.getEnterpriseId();
-			EnterpriseDTO enterprise = enterpriseService.getEnterpriseById(enterpriseId);
-			if(enterprise == null){
-				continue;
-			}
-			ClerkDTO clerk = clerkService.getClerkByClerkCode(enterpriseId, keyword);
-			if(clerk == null){
-				continue;
-			}
-			StoreDTO store = storeService.getStore(clerk.getStoreId());
+		if(CollectionUtil.isEmpty(clerkList)){
+			return resultResponse(HaoBanErrCode.ERR_1,clerkStoreList);
+		}
+		List<EnterpriseDTO> enterpriselist = enterpriseService.listEnterpriseByIds(enterpriseIdList);
+		Map<String,EnterpriseDTO> map = com.gic.commons.util.CollectionUtil.toMap(enterpriselist,"enterpriseId");
+		for (ClerkDTO clerk : clerkList) {
+			String enterpriseId = clerk.getEnterpriseId();
+			EnterpriseDTO enterpriseDTO = map.get(enterpriseId);
 			ClerkStoreVO vo = new ClerkStoreVO();
 			vo.setClerkCode(clerk.getClerkCode());
 			vo.setClerkName(clerk.getClerkName());
 			vo.setClerkType(clerk.getClerkType());
-			vo.setEnterpriseName(enterprise.getEnterpriseName());
+			vo.setEnterpriseName(enterpriseDTO == null?"":enterpriseDTO.getEnterpriseName());
 			vo.setHeadImg(clerk.getHeadImgUrl());
 			vo.setPhoneNumber(clerk.getPhoneNumber());
 			vo.setNationCode(clerk.getNationcode());
-			if(store != null){
-				vo.setStoreName(store.getStoreName());
-			}
+			StoreDTO store = storeService.getStore(clerk.getStoreId());
+			vo.setStoreName(store == null?"":store.getStoreName());
 			clerkStoreList.add(vo);
-			
-			
-			//staffDepartmentRelatedApiService.getOneByClerkCodeAndDepartmentId(clerk.getClerkCode(), departmentId);
-			//List<ClerkDTO> clerkList = clerkService.getClerkByPhoneNumber(phoneNumber, enterpriseId)
 		}
 		return resultResponse(HaoBanErrCode.ERR_1,clerkStoreList);
-		
 	}
 	
 	@RequestMapping("bind-staff")

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -58,6 +58,9 @@
 	<dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseService" id="enterpriseService"/>
 	
 	<dubbo:reference interface="com.gic.haoban.manage.api.service.StaffClerkRelationApiService" id="staffClerkRelationApiService"/>
+		
+	<dubbo:reference interface="com.gic.clerk.api.service.ClerkNewService" id="clerkNewService"/>
 	
 
+
 </beans>