级联应用登录不上企业问题

sso-server/src/main/java/com/uas/sso/controller/LoginController.java

@@ -152,12 +152,12 @@ public class LoginController extends BaseController {
         if (StringUtils.isEmpty(spaceUU)) {
             /*企业uu号为空，让用户选择企业*/
             // 找到用户账号信息
-            List<UserAccount> userAccounts = userAccountService.findByUserUU(appId, user.getUserUU());
+            List<UserAccount> userAccounts = userAccountService.findByUserUU(controlApp.getUid(), user.getUserUU());
 
             // 没有记录
             if (CollectionUtils.isEmpty(userAccounts)) {
                 // 没有记录如果当前应用允许个人账号的话，查找个人账号
-                UserAccount userAccount = personalAccountService.findOneByUserUU(appId, user.getUserUU());
+                UserAccount userAccount = personalAccountService.findOneByUserUU(controlApp.getUid(), user.getUserUU());
                 if (!personalEnable) {
                     // 不支持个人账号则跳转优软云
                     returnUrl = HOME_PAGE;
@@ -174,7 +174,7 @@ public class LoginController extends BaseController {
             return success(getSpaceSelect(userAccounts, personalEnable));
         } else if (personalEnable && Long.valueOf(spaceUU).equals(Const.SPACEUU_PERSONAL)) {
             // 使用个人账号登录
-            UserAccount userAccount = personalAccountService.findOneByUserUU(appId, user.getUserUU());
+            UserAccount userAccount = personalAccountService.findOneByUserUU(controlApp.getUid(), user.getUserUU());
             return loginByUser(userAccount, returnUrl, user.getUserRecord(), true);
         } else {
             // 带企业登录