我的承办

src/main/java/com/xjrsoft/module/oa/dto/OfficialDocumentReceivedHandlePageDto.java

@@ -50,4 +50,7 @@ public class OfficialDocumentReceivedHandlePageDto extends PageInput {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty("落实日期-结束")
     private LocalDate handleDateEnd;
+
+    @ApiModelProperty("登录人id")
+    private Long longUserId;
 }

src/main/java/com/xjrsoft/module/oa/service/impl/OfficialDocumentReceivedHandleServiceImpl.java

@@ -33,6 +33,7 @@ public class OfficialDocumentReceivedHandleServiceImpl extends MPJBaseServiceImp
 
     @Override
     public Page<OfficialDocumentReceivedHandlePageVo> getPage(Page<OfficialDocumentReceivedHandlePageVo> page, OfficialDocumentReceivedHandlePageDto dto) {
+        dto.setLongUserId(StpUtil.getLoginIdAsLong());
         return this.baseMapper.getPage(page, dto);
     }
 

src/main/java/com/xjrsoft/module/system/service/impl/MenuServiceImpl.java

@@ -469,7 +469,7 @@ public class MenuServiceImpl extends MPJBaseServiceImpl<MenuMapper, Menu> implem
      */
     private MenuVo getParentMenu(Long parentId, Map<Long, MenuVo> menuMap) {
         MenuVo menuVo = menuMap.get(parentId);
-        if (menuVo.getParentId().equals(GlobalConstant.FIRST_NODE_VALUE)) {
+        if (menuVo != null && GlobalConstant.FIRST_NODE_VALUE.equals(menuVo.getParentId())) {
             return menuVo;
         }
         return getParentMenu(menuVo.getParentId(), menuMap);

src/main/resources/mapper/oa/OfficialDocumentReceivedHandleMapper.xml

@@ -18,7 +18,9 @@
         LEFT JOIN xjr_dictionary_detail t6 ON t1.received_type = t6.code
         WHERE t2.current_state = 'COMPLETED'
         AND t1.delete_mark = 0
-        AND t5.delete_mark = 0
+        <if test="dto.loginUserId != null">
+            AND (t1.handle_duty_user_id = #{dto.loginUserId} or t5.receive_user_id = #{dto.loginUserId})
+        </if>
         <if test="dto.handleUserName != null and dto.handleUserName != ''">
             AND t4.name like concat('%', #{dto.handleUserName},'%')
         </if>