Commit 8cdf2ef8 by huangjy

fix:子女端登陆绑定长者逻辑修改

parent 6a8033c9
...@@ -196,10 +196,7 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild ...@@ -196,10 +196,7 @@ public class PlatElderChildrenInfoServiceImpl extends ServiceImpl<PlatElderChild
List<PlatElderChildrenInfoWechatVO> voList = Lists.newArrayList(); List<PlatElderChildrenInfoWechatVO> voList = Lists.newArrayList();
for (PlatElderChildrenInfo platElderChildrenInfo : platElderChildrenInfoList) { for (PlatElderChildrenInfo platElderChildrenInfo : platElderChildrenInfoList) {
PlatElderChildrenInfoWechatVO vo = BeanDtoVoUtils.convert(platElderChildrenInfo, PlatElderChildrenInfoWechatVO.class); PlatElderChildrenInfoWechatVO vo = BeanDtoVoUtils.convert(platElderChildrenInfo, PlatElderChildrenInfoWechatVO.class);
PlatElder platElder = elderMap.get(platElderChildrenInfo.getElderId()); vo.setPlatElder(elderMap.getOrDefault(platElderChildrenInfo.getElderId(),new PlatElder()));
if (platElder != null) {
vo.setElderName(platElder.getName());
}
voList.add(vo); voList.add(vo);
} }
......
package com.makeit.vo.wechat.elder; package com.makeit.vo.wechat.elder;
import com.makeit.common.dto.BaseTenantDTO; import com.makeit.common.dto.BaseTenantDTO;
import com.makeit.entity.platform.elder.PlatElder;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -21,8 +22,8 @@ public class PlatElderChildrenInfoWechatVO extends BaseTenantDTO { ...@@ -21,8 +22,8 @@ public class PlatElderChildrenInfoWechatVO extends BaseTenantDTO {
@ApiModelProperty(value = "长者id") @ApiModelProperty(value = "长者id")
private String elderId; private String elderId;
@ApiModelProperty(value = "长者名称") @ApiModelProperty(value = "长者信息")
private String elderName; private PlatElder platElder;
@ApiModelProperty(value = "姓名") @ApiModelProperty(value = "姓名")
private String name; private String name;
......
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 sign in to comment