From 724eeacdf36ce55fa7538b600b6dfc3ef21bcb75 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 20 五月 2021 13:51:27 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java
index d4aa86f..a16b9c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVaccinesEnrollRecordServiceImpl.java
@@ -12,6 +12,7 @@
import com.panzhihua.common.model.vos.vaccines.VaccinesEnrollUserByAppVO;
import com.panzhihua.common.utlis.AgeUtils;
import com.panzhihua.common.utlis.IdCard;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComMngVaccinesDAO;
import com.panzhihua.service_community.dao.ComMngVaccinesEnrollRecordDAO;
import com.panzhihua.service_community.model.dos.ComMngVaccinesDO;
@@ -44,6 +45,7 @@
public R getVaccinesUserListByApp(VaccinesEnrollUserByAppDTO enrollUserByAppDTO){
//查询当前用户的家庭成员列表
List<VaccinesEnrollUserByAppVO> userLists = new ArrayList<>();
+ List<VaccinesEnrollUserByAppVO> newUserLists = new ArrayList<>();
//将自己的信息组装进家庭成员列表中
VaccinesEnrollUserByAppVO ownUser = this.baseMapper.getSysUser(enrollUserByAppDTO.getUserId());
if(ownUser != null){
@@ -62,18 +64,23 @@
if(user.getIsUser() == null){
user.setIsUser(2);
}
+ if(StringUtils.isEmpty(user.getJob())){
+ user.setJob("暂无");
+ }
//查询当前用户是否已经报名
ComMngVaccinesEnrollRecordDO enrollRecordDO = this.baseMapper.selectOne(new QueryWrapper<ComMngVaccinesEnrollRecordDO>()
- .lambda().eq(ComMngVaccinesEnrollRecordDO::getFamilyUserId,user.getUserId()).eq(ComMngVaccinesEnrollRecordDO::getType,enrollUserByAppDTO.getVaccinesId()));
+ .lambda().eq(ComMngVaccinesEnrollRecordDO::getFamilyUserId,user.getUserId())
+ .eq(ComMngVaccinesEnrollRecordDO::getType,enrollUserByAppDTO.getVaccinesId())
+ .eq(ComMngVaccinesEnrollRecordDO::getFamilyUserType,user.getIsUser()));
if(enrollRecordDO != null){
user.setIsEnroll(VaccinesEnrollUserByAppVO.isEnroll.yes);
}else{
user.setIsEnroll(VaccinesEnrollUserByAppVO.isEnroll.no);
+ newUserLists.add(user);
}
-
});
}
- return R.ok(userLists);
+ return R.ok(newUserLists);
}
/**
--
Gitblit v1.7.1