xiugai

src/main/java/cn/quantgroup/customer/rest/UserRest.java

@@ -265,8 +265,11 @@ public class UserRest {
      */
     @PostMapping(value = "/search/userInfo")
     public JsonResult getBasicUserInfo(UserQueryParam userQueryParam) {
-        JsonResult<UserBasicInfo> result = userService.findUserInfoByUserParam(userQueryParam);
-        return JsonResult.buildSuccessResult("success",result);
+        JsonResult result = userService.findUserInfoByUserParam(userQueryParam);
+        if(!result.isSuccess()){
+            return JsonResult.buildErrorStateResult(result.getMsg(),result.getData());
+        }
+        return JsonResult.buildSuccessResult("success",result.getData());
     }
 
     /**

src/main/java/cn/quantgroup/customer/service/impl/UserServiceImpl.java

@@ -786,7 +786,7 @@ public class UserServiceImpl implements IUserService {
         }
     }
     @Override
-    public JsonResult<UserBasicInfo> findUserInfoByUserParam(UserQueryParam userQueryParam) {
+    public JsonResult findUserInfoByUserParam(UserQueryParam userQueryParam) {
         final String LOG_PRE = "UserServiceImpl.findUserInfoByUserParam";
         log.info("{} 查询用户信息 UserQueryParam={}", LOG_PRE, userQueryParam);
         //通过userId查询
@@ -822,13 +822,11 @@ public class UserServiceImpl implements IUserService {
         if (Objects.nonNull(userQueryParam.getUserId())) {
             if(userByUserId == null || userDetailByUserId ==null || userByUserId.getData() ==null || userDetailByUserId.getData() ==null){
                 return JsonResult.buildErrorStateResult("用户不存在", null);
-
             }
         }
         if (StringUtils.isNotBlank(userQueryParam.getPhoneNo())) {
             if(userByPhoneNo == null || userDetailByPhone ==null || userByPhoneNo.getData() ==null || userDetailByPhone.getData() ==null){
                 return JsonResult.buildErrorStateResult("用户不存在", null);
-
             }
         }
         //调用kdsp接口获取会员权益相关信息