周伟鹏 / cnlive_shenhe · Commits

Commit d0893e50a5a92439b6baa2512d5992f98077c17e

Authored by 王言钊
1 parent f2f0604d

修改要显示的用户id数据

Inline Side-by-side
Showing 2 changed files with 12 additions and 2 deletions
src/main/java/com/cnlive/shenhe/bean/SessionUser.java
  View file @d0893e5
@@ -9,6 +9,7 @@ public class SessionUser { @@ -9,6 +9,7 @@ public class SessionUser {
9 9
10 public static final String SESSION_KEY = "sessionUser"; 10 public static final String SESSION_KEY = "sessionUser";
11 11
  12 + private String id;
12 private String userId; 13 private String userId;
13 private String userName; 14 private String userName;
14 private Integer spid; 15 private Integer spid;
@@ -17,6 +18,14 @@ public class SessionUser { @@ -17,6 +18,14 @@ public class SessionUser {
17 private String logo; 18 private String logo;
18 private boolean master; 19 private boolean master;
19 20
  21 + public String getId() {
  22 + return id;
  23 + }
  24 +
  25 + public void setId(String id) {
  26 + this.id = id;
  27 + }
  28 +
20 public String getUserId() { 29 public String getUserId() {
21 return userId; 30 return userId;
22 } 31 }
src/main/java/com/cnlive/shenhe/controller/UsersController.java
  View file @d0893e5
@@ -89,6 +89,7 @@ public class UsersController extends BaseController { @@ -89,6 +89,7 @@ public class UsersController extends BaseController {
89 ShyUsers user = usersService.get(Integer.parseInt(id)); 89 ShyUsers user = usersService.get(Integer.parseInt(id));
90 if (CommonUtils.isNotNull(user) && user.getState()) { 90 if (CommonUtils.isNotNull(user) && user.getState()) {
91 SessionUser sessionUser = new SessionUser(); 91 SessionUser sessionUser = new SessionUser();
  92 + sessionUser.setId(id);
92 sessionUser.setUserId(user.getUser_id()); 93 sessionUser.setUserId(user.getUser_id());
93 sessionUser.setSpid(Integer.parseInt(principal.getAttributes().get("new_sp_id").toString())); 94 sessionUser.setSpid(Integer.parseInt(principal.getAttributes().get("new_sp_id").toString()));
94 sessionUser.setUserName(user.getUsername()); 95 sessionUser.setUserName(user.getUsername());
@@ -100,7 +101,7 @@ public class UsersController extends BaseController { @@ -100,7 +101,7 @@ public class UsersController extends BaseController {
100 ShyLog shyLog = new ShyLog(); 101 ShyLog shyLog = new ShyLog();
101 shyLog.setVideoId("-"); 102 shyLog.setVideoId("-");
102 shyLog.setVideoName("-"); 103 shyLog.setVideoName("-");
103 - shyLog.setOperator(user.getUsername() + "(" + user.getUser_id() + ")"); 104 + shyLog.setOperator(user.getUsername() + "(" + user.getId() + ")");
104 shyLog.setOperationTime(new Date()); 105 shyLog.setOperationTime(new Date());
105 shyLog.setOperationType("登录"); 106 shyLog.setOperationType("登录");
106 shyLog.setRemark(user.getUsername() + "--" + "登录"); 107 shyLog.setRemark(user.getUsername() + "--" + "登录");
@@ -119,7 +120,7 @@ public class UsersController extends BaseController { @@ -119,7 +120,7 @@ public class UsersController extends BaseController {
119 ShyLog shyLog = new ShyLog(); 120 ShyLog shyLog = new ShyLog();
120 shyLog.setVideoId("-"); 121 shyLog.setVideoId("-");
121 shyLog.setVideoName("-"); 122 shyLog.setVideoName("-");
122 - shyLog.setOperator(sessionUser.getUserName() + "(" + sessionUser.getUserId() + ")"); 123 + shyLog.setOperator(sessionUser.getUserName() + "(" + sessionUser.getId() + ")");
123 shyLog.setOperationTime(new Date()); 124 shyLog.setOperationTime(new Date());
124 shyLog.setOperationType("注销"); 125 shyLog.setOperationType("注销");
125 shyLog.setRemark(sessionUser.getUserName() + "--" + "注销"); 126 shyLog.setRemark(sessionUser.getUserName() + "--" + "注销");