修改queryUserDto方法

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -735,11 +735,17 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             return new Result<UserDTO>().error("openId、unionId不能同时为空");
         }
         QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(formDTO.getUnionId()), UserFieldConsant.WX_UNION_ID, formDTO.getUnionId())
+        UserEntity userEntity = null;
-            .eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId())
+        if (StringUtils.isNotBlank(formDTO.getUnionId())) {
-            .orderByDesc(FieldConstant.CREATED_TIME);
+            wrapper.eq(UserFieldConsant.WX_UNION_ID, formDTO.getUnionId());
-        UserEntity userEntity = this.baseDao.selectOne(wrapper);
+            userEntity = this.baseDao.selectOne(wrapper);
-
+        }
+        if (null == userEntity) {
+            wrapper.eq(UserFieldConsant.WX_UNION_ID, formDTO.getUnionId())
+                .eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId())
+                .orderByDesc(FieldConstant.CREATED_TIME);
+            userEntity = this.baseDao.selectOne(wrapper);
+        }
         if (null != userEntity) {
             QueryWrapper<UserGridRelationEntity> ugWrapper = new QueryWrapper<>();
             ugWrapper.eq(UserFieldConsant.USER_ID, userEntity.getId())