From f0f58829c5c8dd9b249f594526f01fa957cbdd59 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 12 四月 2023 18:03:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/user/service/impl/UserService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
index ceac340..3610bfb 100644
--- a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
+++ b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
@@ -60,6 +60,9 @@
// System.out.println(user.getUserId());
// System.out.println(user.getOrganizationId());
// System.out.println(StuStudent.STATUS_ACTIVE);
+ System.out.println(user.getOrganizationId());
+ System.out.println(user.getUserId());
+
ClsClass objClsClass = this.findUnique("select c from StuStudent t,"
+ " ClsClass c where c.classId = t.classId "
+ " and c.orgId = ? and t.userId = ? and t.status = ? order by t.createTime desc", CollectionUtils.newList(user.getOrganizationId(), user.getUserId(), StuStudent.STATUS_ACTIVE), ClsClass.class);
@@ -67,7 +70,6 @@
wrapper.setOrg(org);
wrapper.setClass(objClsClass);
wrapper.setLoginInfo(param.getCacheIpFlag(), param.getIp(), param.getPlatForm());
- System.out.println("aaa"+user.getUserId());
session.setAttribute(UserInfoWrapper.INF_USER_ID,user.getUserId());
session.setAttribute(UserInfoWrapper.INF_USER_NAME,user.getName());
if(objClsClass!=null){
--
Gitblit v1.8.0