Merge branch 'login' of http://git.quantgroup.cn/QG/customer-service into login

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

@@ -282,9 +282,14 @@ public class UserServiceImpl implements IUserService {
             return JsonResult.buildErrorStateResult("远程调用结果为空", null);
         }
 
-        if (!userSysResult.isSuccess() || Objects.isNull(userSysResult.getData())) {
+        if (!userSysResult.isSuccess()) {
             log.error("{} 远程调用失败 userSysResult={}", logPre, userSysResult);
-            return JsonResult.buildErrorStateResult(userSysResult.getMsg(), userSysResult.getData());
+            return JsonResult.buildErrorStateResult("查询用户失败", userSysResult.getData());
+        }
+
+        if(Objects.isNull(userSysResult.getData())){
+            log.error("{} 用户不存在 userSysResult={}", logPre, userSysResult);
+            return JsonResult.buildErrorStateResult("用户不存在", userSysResult.getData());
         }
         return userSysResult.getData();
     }
@@ -501,7 +506,7 @@ public class UserServiceImpl implements IUserService {
                 return JsonResult.buildErrorStateResult("查询失败", null);
             }
             if (Objects.isNull(orderMapping.getData())) {
-                return JsonResult.buildSuccessResult("无数据,请用其他参数查询", null);
+                return JsonResult.buildErrorStateResult("无数据,请用其他参数查询", null);
             }
             Long qgUserId = orderMapping.getData().getQgUserId();
             UserSysResult<XUserDetail> userDetailByUserId = userSdk.getService().findUserDetailByUserId(qgUserId);