xiewj 2 lat temu
rodzic
commit
0eaf5a1112

+ 2 - 0
src/main/java/com/fdkankan/site/controller/LoginController.java

@@ -53,6 +53,8 @@ public class LoginController extends BaseController {
                 User user = userService.findByUserName(data.getUser().getUserName(),data.getUser().getId(),data.getUser().getHead());
                 StpUtil.login(user.getUserName(), saLoginModel);
                 StpUtil.getSession().set("user",user);
+                data.getUser().setFdkkId(data.getUser().getId());
+                data.getUser().setId(user.getUserId());
                 return ResultData.ok(data);
             }
             return ResultData.error(fdkkLoginVo.getCode(), fdkkLoginVo.getMsg());

+ 1 - 1
src/main/java/com/fdkankan/site/handler/MyMetaObjectHandler.java

@@ -39,7 +39,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
         // 起始版本 3.3.3(推荐)
         boolean updateByTimeSetter = metaObject.hasSetter("updateBy");
         if (StpUtil.isLogin()&&ObjectUtil.isNotEmpty(StpUtil.getSession().getModel("user",User.class))&&updateByTimeSetter){
-            User user = (User)StpUtil.getSession().get("user");
+            User user = StpUtil.getSession().getModel("user",User.class);
             this.setFieldValByName( "updateBy", String.valueOf(user.getUserId()),metaObject); // 起始版本 3.3.3(推荐)
         }
         this.setFieldValByName("updateTime", LocalDateTime.now(), metaObject);

+ 3 - 3
src/main/resources/mapper/site/CommentsMapper.xml

@@ -16,9 +16,9 @@
         t.update_time,
         t.create_by,
         t.update_by,
-        (SELECT t2.nick_name FROM t_project_team t2 WHERE t1.project_id=t2.project_id and t.user_id=t2.user_id and t2.tb_status = 0 ) nick_name,
-        (SELECT t3.nick_name FROM t_project_team t3 WHERE t1.project_id=t3.project_id and t.parent_user_id=t3.user_id and t3.tb_status = 0 ) reply_nick_name ,
-        (SELECT t4.head FROM t_users t4 WHERE   t.user_id=t.user_id and t4.tb_status = 0 ) head
+        (SELECT t2.nick_name FROM t_project_team t2 WHERE t2.project_id=  t1.project_id and t2.user_id=t.user_id and t2.tb_status = 0 ) nick_name,
+        (SELECT t3.nick_name FROM t_project_team t3 WHERE t3.project_id= t1.project_id and  t3.user_id =t .parent_user_id and t3.tb_status = 0 ) replyNickName,
+        (SELECT t4.head FROM t_users t4 WHERE   t4.user_id=t.user_id and t4.tb_status = 0 ) head
         FROM
         t_comments t
         LEFT JOIN t_marking t1 ON ( t1.marking_id = t.marking_id )