From 2b53822c36a61cc2c062a595190f3364724dc400 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 9 Apr 2026 09:49:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/jeecg/config/shiro/ShiroConfig.java    | 2 +-
 .../modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml   | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
index 905c915e..9ef6b34d 100644
--- a/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
+++ b/nursing-unit-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
@@ -93,7 +93,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/api/pad/invoicing/getShareInfoByCgdId", "anon"); //查询采购单信息（分享接口使用）
         filterChainDefinitionMap.put("/api/pad/invoicing/getCgdListByGysId", "anon"); //查询采购单列表信息（小程序使用）
         filterChainDefinitionMap.put("/api/pad/invoicing/getCgdInfoByCgdId", "anon"); //查询采购单列表详细信息（小程序使用）
-        filterChainDefinitionMap.put("/api/pad/baseInfo/queryPadPageList", "anon"); //查询采购单列表详细信息（小程序使用）
+//        filterChainDefinitionMap.put("/api/pad/baseInfo/queryPadPageList", "anon"); //查询采购单列表详细信息（小程序使用）
 //        filterChainDefinitionMap.put("/api/pad/invoicing/pdd/**", "anon"); //查询盘点单
 //        filterChainDefinitionMap.put("/api/employeesInfo/**", "anon"); //测试员工接口
 //        filterChainDefinitionMap.put("/api/pad/invoicing/**", "anon"); //测试进销存对应的接口
diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml
index a783782b..2ac89cfb 100644
--- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml
+++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml
@@ -81,15 +81,10 @@
     </select>
 
     <select id="queryReadList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">
-        select employee_id as empId,nu_id,'gd' as type , '工单' as typeName from nu_biz_directive_order where employee_id = #{employeesId} GROUP BY employee_id,nu_id
+        select employee_id as empId,nu_id,'gd' as type , '工单' as typeName from nu_biz_directive_order where employee_id = #{employeesId} and serv_start_time like CONCAT('%',DATE_FORMAT(NOW(), '%Y-%m-%d'),'%')  and (serv_start_time > NOW() or serv_end_time > now()) and emp_end_time is null GROUP BY employee_id,nu_id
         union ALL
         select create_by as empId,nu_id,'pdd' as type,'盘点单' as typeName from nu_invoicing_pdd_main where pdd_type = '1' and create_by = #{username} GROUP BY create_by,nu_id
-<!--        union all-->
-<!--        select tj_by as empId,nu_id,'qld' as type,'请领单' as typeName from nu_invoicing_qld_main where status in (1,3,4) and tj_by = #{employeesId} GROUP BY tj_by,nu_id-->
-<!--        union all-->
-<!--        select create_by as empId,nu_id,'cgd' as type,'采购单' as typeName from nu_invoicing_cgd_main where cgd_type in (0,1) and create_by = #{username} GROUP BY create_by,nu_id-->
-<!--        union ALL-->
-<!--        select fq_by as empId,nu_id,'thd' as type,'退货单' as typeName from nu_invoicing_thd_main where status = '1' and fq_by = #{employeesId}  GROUP BY fq_by,nu_id-->
+
     </select>
 
     <update id="updateSbsfTplink">