From fb19d90743b7bd7937420dd4a77f4e74f8a09f7c Mon Sep 17 00:00:00 2001 From: yujintao Date: Sat, 7 Dec 2019 17:51:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E6=97=B6?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/UserServiceImpl.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 83c97a184..b1b86efbc 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -428,8 +428,8 @@ public class UserServiceImpl extends BaseServiceImpl implem // userGridRel.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId()); // userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity()); // userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId()); - Result parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRel.getGridId().toString()); - if(!parentAndAllDeptDTOResult.success()){ + Result parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGridId().toString()); + if (!parentAndAllDeptDTOResult.success()) { return new Result().error(parentAndAllDeptDTOResult.getMsg()); } userGridRel.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); @@ -769,8 +769,8 @@ public class UserServiceImpl extends BaseServiceImpl implem * @date 2019/12/7 17:19 */ private UserDTO selectUserByWxInfo(String openId, String unionId) { - if (!StringUtils.isNotBlank(openId) && !StringUtils.isNotBlank(unionId)) { - throw new RenException("openId、unionId不能同时为空"); + if (StringUtils.isBlank(openId)) { + throw new RenException("openId不能同时为空"); } QueryWrapper wrapper = new QueryWrapper<>(); UserEntity userEntity = null; @@ -779,9 +779,7 @@ public class UserServiceImpl extends BaseServiceImpl implem userEntity = this.baseDao.selectOne(wrapper); } if (null == userEntity) { - wrapper.eq(UserFieldConsant.WX_UNION_ID, unionId) - .or() - .eq(StringUtils.isNotBlank(openId), UserFieldConsant.WX_OPEN_ID, openId) + wrapper.eq(UserFieldConsant.WX_OPEN_ID, openId) .orderByDesc(FieldConstant.CREATED_TIME); userEntity = this.baseDao.selectOne(wrapper); }