我的消息

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserNoteController.java

@@ -3,6 +3,9 @@ package com.zhongzheng.controller.user;
 import java.util.List;
 import java.util.Arrays;
 
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.WxTokenService;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.vo.UserDateNoteVo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -43,6 +46,8 @@ public class UserNoteController extends BaseController {
 
     private final IUserNoteService iUserNoteService;
 
+    private final WxTokenService wxTokenService;
+
     /**
      * 查询用户笔记记录列表
      */
@@ -50,6 +55,8 @@ public class UserNoteController extends BaseController {
     @GetMapping("/listDate")
     public TableDataInfo<UserDateNoteVo> listDate(UserNoteQueryBo bo) {
         startPage();
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         List<UserDateNoteVo> list = iUserNoteService.listDate(bo);
         return getDataTable(list);
     }
@@ -62,6 +69,8 @@ public class UserNoteController extends BaseController {
     @Log(title = "用户笔记记录", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody UserNoteAddBo bo) {
+        ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setUserId(loginUser.getUser().getUserId());
         return toAjax(iUserNoteService.insertByAddBo(bo) ? 1 : 0);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserNoteAddBo.java

@@ -55,4 +55,8 @@ public class UserNoteAddBo {
     /** 1有效 */
     @ApiModelProperty("1有效")
     private Integer status;
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserNoteEditBo.java

@@ -65,4 +65,8 @@ public class UserNoteEditBo {
     @ApiModelProperty("1有效")
     private Integer status;
 
+    /** 用户ID */
+    @ApiModelProperty("用户ID")
+    private Long userId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserNoteQueryBo.java

@@ -68,4 +68,8 @@ public class UserNoteQueryBo extends BaseEntity {
 	/** 1有效 */
 	@ApiModelProperty("1有效")
 	private List<Integer> status;
+
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserNote.java

@@ -53,4 +53,7 @@ private static final long serialVersionUID=1L;
 
     /** 1有效 */
     private Integer status;
+    /** 用户ID */
+    private Long userId;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserNoteVo.java

@@ -67,5 +67,9 @@ public class UserNoteVo {
 	/** 1有效 */
 	@ApiModelProperty("1有效")
 	private Integer status;
+	/** 用户ID */
+	@ApiModelProperty("用户ID")
+	private Long userId;
+
 
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserNoteMapper.xml

@@ -46,6 +46,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         <if test="gradeId != null and gradeId !='' ">
             AND un.grade_id =#{gradeId}
+        </if>
+          <if test="userId != null and userId !='' ">
+            AND un.user_id =#{userId}
         </if>
         order by un.note_date desc
     </select>