|
|
@@ -7,10 +7,7 @@ import com.uas.sso.SSOHelper;
|
|
|
import com.uas.sso.SSOToken;
|
|
|
import com.uas.sso.common.util.HttpUtil;
|
|
|
import com.uas.sso.core.Const;
|
|
|
-import com.uas.sso.entity.App;
|
|
|
-import com.uas.sso.entity.User;
|
|
|
-import com.uas.sso.entity.UserAccount;
|
|
|
-import com.uas.sso.entity.UserRecord;
|
|
|
+import com.uas.sso.entity.*;
|
|
|
import com.uas.sso.service.AppService;
|
|
|
import com.uas.sso.service.PersonalAccountService;
|
|
|
import com.uas.sso.service.UserService;
|
|
|
@@ -394,8 +391,8 @@ public class LoginController extends BaseController {
|
|
|
public ModelMap getPageStyle(@RequestParam(defaultValue = "sso") String appId) {
|
|
|
App app = appService.findOne(appId);
|
|
|
App defaultApp = appService.findOne("sso");
|
|
|
- app = app == null ? defaultApp : app;
|
|
|
- BeanUtil.copyProperties(app, defaultApp, true);
|
|
|
- return success(app.getPageStyle());
|
|
|
+ PageStyle pageStyle = app == null ? defaultApp.getPageStyle() : app.getPageStyle();
|
|
|
+ BeanUtil.copyProperties(pageStyle, defaultApp.getPageStyle(), true);
|
|
|
+ return success(defaultApp.getPageStyle());
|
|
|
}
|
|
|
}
|
wangmh