From 47de8ceefb38ee55fc577f94bfda09dd5adbd29d Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 22 十二月 2020 17:18:39 +0800
Subject: [PATCH] 测试更新
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index 5349eef..c1abb3f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -27,6 +27,7 @@
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.*;
@@ -471,7 +472,7 @@
}
SysUserDO sysUserDO1 = userDao.selectById(userPhoneVO.getUserId());
String phone = sysUserDO1.getPhone();
- if (!phone.equals(oldPhone)) {
+ if (!StringUtils.isEmpty(phone)&& !phone.equals(oldPhone)) {
return R.fail("旧手机号错误");
}
ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
@@ -536,6 +537,10 @@
public R addFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
ComMngFamilyInfoDO comMngFamilyInfoDO=new ComMngFamilyInfoDO();
BeanUtils.copyProperties(comMngFamilyInfoVO,comMngFamilyInfoDO);
+ ComMngFamilyInfoDO comMngFamilyInfoDO1 = comMngFamilyInfoDAO.selectOne(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getIdCard, comMngFamilyInfoVO.getIdCard()).eq(ComMngFamilyInfoDO::getUserId, comMngFamilyInfoVO.getUserId()));
+ if (!ObjectUtils.isEmpty(comMngFamilyInfoDO1)) {
+ return R.fail("家庭成员已经存在");
+ }
int insert = comMngFamilyInfoDAO.insert(comMngFamilyInfoDO);
if (insert>0) {
return R.ok();
@@ -552,7 +557,7 @@
@Override
public R putFamily(ComMngFamilyInfoVO comMngFamilyInfoVO) {
ComMngFamilyInfoDO comMngFamilyInfoDO=new ComMngFamilyInfoDO();
- BeanUtils.copyProperties(comMngFamilyInfoDO,comMngFamilyInfoVO);
+ BeanUtils.copyProperties(comMngFamilyInfoVO,comMngFamilyInfoDO);
int update = comMngFamilyInfoDAO.updateById(comMngFamilyInfoDO);
if (update>0) {
return R.ok();
--
Gitblit v1.7.1