Commit aa790837 by fudahua

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

parents a17d9005 29746297
......@@ -139,15 +139,12 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
}
List<StaffClerkInfoDTO> infoDTOS = EntityUtil.changeEntityListByJSON(StaffClerkInfoDTO.class, list);
Map<String, String> nameMap = new HashMap<>();
logger.info("测试========================================");
infoDTOS.forEach(infoDTO -> {
//企业
if (!nameMap.containsKey(infoDTO.getEnterpriseId())) {
EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(infoDTO.getEnterpriseId());
if (null != enterpriseDTO) {
nameMap.put(infoDTO.getEnterpriseId(), enterpriseDTO.getBrandName()+"_"+enterpriseDTO.getEnterpriseName());
logger.info(enterpriseDTO.getEnterpriseName());
logger.info(enterpriseDTO.getBrandName());
nameMap.put(infoDTO.getEnterpriseId(), enterpriseDTO.getEnterpriseName()+"_"+enterpriseDTO.getBrandName());
} else {
nameMap.put(infoDTO.getEnterpriseId(), "未知商户");
}
......@@ -176,11 +173,13 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
infoDTO.setClerkName(nameMap.get(infoDTO.getClerkId()));
infoDTO.setStoreName(nameMap.get(infoDTO.getStoreId()));
if (nameMap.get(infoDTO.getEnterpriseName())!=null){
String EnterpriseandBrandName= nameMap.get(infoDTO.getEnterpriseName());
if ((nameMap.get(infoDTO.getEnterpriseId()))!=null){
String EnterpriseandBrandName= nameMap.get(infoDTO.getEnterpriseId());
String split[]=EnterpriseandBrandName.split("_");
infoDTO.setEnterpriseName(split[0]);
if (split[1]!=null)infoDTO.setBrandName(split[1]);
if (split[1]!=null){
infoDTO.setBrandName(split[1]);
}
}
// infoDTO.setEnterpriseName(nameMap.get(infoDTO.getEnterpriseId()));
});
......
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