Commit 31b602e4 by 墨竹

fix:空判断

parent 997c3097
...@@ -106,17 +106,18 @@ public class ClerkController extends WebBaseController { ...@@ -106,17 +106,18 @@ public class ClerkController extends WebBaseController {
Map<String, StaffDTO> map = com.gic.commons.util.CollectionUtil.toMap(resultlist, "staffId"); Map<String, StaffDTO> map = com.gic.commons.util.CollectionUtil.toMap(resultlist, "staffId");
List<StaffVO> resultList = new ArrayList<>(); List<StaffVO> resultList = new ArrayList<>();
for (StaffClerkRelationDTO staffClerkRelationDTO : list) { for (StaffClerkRelationDTO staffClerkRelationDTO : list) {
StaffDTO staffDTO = map.get(staffClerkRelationDTO.getStaffId()); String staffId = staffClerkRelationDTO.getStaffId();
ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode()); logger.info("员工id为:{}", staffId);
if (clerk != null) { StaffDTO staffDTO = map.get(staffId);
long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId); if (staffDTO != null) {
logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},memberCount={}", staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId, memberCount); ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), staffClerkRelationDTO.getClerkCode());
if (memberCount != 0) { if (clerk != null) {
logger.info("会员数为:{}", memberCount); long memberCount = distributeApiService.getClerkMemberCount(staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId);
logger.info("【获取会员数】enterpriseId={},clerkId={},storeId={},memberCount={}", staffClerkRelationDTO.getEnterpriseId(), clerk.getClerkId(), storeId, memberCount);
staffDTO.setMemberCount(memberCount); staffDTO.setMemberCount(memberCount);
staffDTO.setClerkId(clerk.getClerkId());
resultList.add(EntityUtil.changeEntityNew(StaffVO.class, staffDTO));
} }
staffDTO.setClerkId(clerk.getClerkId());
resultList.add(EntityUtil.changeEntityNew(StaffVO.class, staffDTO));
} }
} }
return resultResponse(HaoBanErrCode.ERR_1, resultList); return resultResponse(HaoBanErrCode.ERR_1, resultList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment