From 519134078d8e6fbd26faa0e5bbea79fb2f45ed32 Mon Sep 17 00:00:00 2001
From: hansha <bdqn_hansha@163.com>
Date: Mon, 9 Dec 2024 10:45:52 +0800
Subject: [PATCH] =?UTF-8?q?sql=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/da/dangan/controller/DaCatalogController.java  | 2 +-
 .../src/main/resources/mapper/dangan/DaBirthDjMapper.xml    | 6 +++---
 .../src/main/resources/mapper/dangan/DaCatalogMapper.xml    | 4 ++--
 .../src/main/resources/mapper/dangan/DaCzrkdjMapper.xml     | 6 +++---
 .../main/resources/mapper/dangan/DaPicturesRecardMapper.xml | 2 +-
 .../src/main/resources/mapper/dangan/DaQyzMapper.xml        | 6 +++---
 .../src/main/resources/mapper/dangan/DaTaskMapper.xml       | 2 +-
 .../src/main/resources/mapper/dangan/DaYtzmMapper.xml       | 6 +++---
 .../src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml   | 6 +++---
 .../src/main/resources/mapper/dangan/DaZqzMapper.xml        | 6 +++---
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java
index b40c643..ad4ef3e 100644
--- a/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java
+++ b/dangan-dangan/src/main/java/com/da/dangan/controller/DaCatalogController.java
@@ -39,7 +39,7 @@ public class DaCatalogController extends BaseController
     }
 
     /**
-     * 根据档案目录列表统计已识别数量  --此方法只需调用一次，用于把计算的数添加到catalog记录的countNum中
+     * 根据心在档案目录列表计算各级目录已识别档案数量  --修改统计目录逻辑后，此方法只需调用一次，用于把计算的数添加到catalog记录的countNum中
      * @param daCatalog
      * @return
      */
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml
index 746b471..3438b63 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaBirthDjMapper.xml
@@ -51,7 +51,7 @@
 
     <select id="selectDaBirthDjList" parameterType="DaBirthDj" resultMap="DaBirthDjResult">
         select distinct b.* from da_birth_dj b
-        left join da_user_catalog uc on b.mu_id = uc.mu_id
+        <if test="userId != null  ">left join da_user_catalog uc on b.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="taskId != null ">and task_id = #{taskId}</if>
@@ -118,7 +118,7 @@
     <!--检索+同音-->
     <select id="searchDaBirthDjList" parameterType="DaBirthDj" resultMap="DaBirthDjResult">
         select distinct b.* from da_birth_dj b
-        left join da_user_catalog uc on b.mu_id = uc.mu_id
+        <if test="userId != null  ">left join da_user_catalog uc on b.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="name != null  and name != ''">
@@ -149,7 +149,7 @@
     <!--检索不加同音-->
     <select id="searchDaBirthDjList1" parameterType="DaBirthDj" resultMap="DaBirthDjResult">
         select distinct b.* from da_birth_dj b
-        left join da_user_catalog uc on b.mu_id = uc.mu_id
+        <if test="userId != null  ">left join da_user_catalog uc on b.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="name != null  and name != ''">
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
index 0fd12d7..5b32783 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCatalogMapper.xml
@@ -127,7 +127,7 @@
 		)
 	</select>
 
-    <!--根据父id导出目录-->
+    <!--根据父id导出目录 超管跟管理员使用-->
     <select id="exportDaCatalogList" resultMap="DaCatalogResult">
         <include refid="selectDaCatalogVo"/>
         <where>
@@ -136,7 +136,7 @@
         order by pid asc, order_num desc
 	</select>
 
-    <!--根据父id、userId导出目录-->
+    <!--根据父id、userId导出目录  其他用户使用-->
     <select id="exportDaCatalogListByUserId" resultMap="DaCatalogResult">
         select distinct c.*  from da_catalog c
         left join da_user_catalog uc on c.id = uc.mu_id
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml
index abd003a..b73d8f0 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaCzrkdjMapper.xml
@@ -72,7 +72,7 @@
 
     <select id="selectDaCzrkdjList" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
         select distinct c.* from da_czrkdj c
-        left join da_user_catalog uc on c.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on c.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="taskId != null ">and task_id = #{taskId}</if>
@@ -156,7 +156,7 @@
     <!--检索+同音字-->
     <select id="searchDaCzrkdjList" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
         select distinct c.* from da_czrkdj c
-        left join da_user_catalog uc on c.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on c.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="ywType != null  and ywType != ''">and yw_type = #{ywType}</if>
@@ -198,7 +198,7 @@
     <!--检索+无同音字-->
     <select id="searchDaCzrkdjList1" parameterType="DaCzrkdj" resultMap="DaCzrkdjResult">
         select distinct c.* from da_czrkdj c
-        left join da_user_catalog uc on c.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on c.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="ywType != null  and ywType != ''">and yw_type = #{ywType}</if>
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml
index 8a6a989..f21a25f 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaPicturesRecardMapper.xml
@@ -29,7 +29,7 @@
 
     <select id="selectDaPicturesRecardList" parameterType="DaPicturesRecard" resultMap="DaPicturesRecardResult">
         select distinct p.* from da_pictures_recard p
-        left join da_user_catalog uc on p.mu_id = uc.mu_id
+        <if test="userId != null  ">left join da_user_catalog uc on p.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null"> and uc.user_id = #{userId}</if>
             <if test="id != null "> and id = #{id}</if>
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml
index 310dff7..14112d4 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaQyzMapper.xml
@@ -52,7 +52,7 @@
 
     <select id="selectDaQyzList" parameterType="DaQyz" resultMap="DaQyzResult">
         select distinct q.* from da_qyz q
-        left join da_user_catalog uc on q.mu_id = uc.mu_id
+        <if test="userId != null  ">left join da_user_catalog uc on q.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null">and uc.user_id = #{userId}</if>
             <if test="taskId != null ">and task_id = #{taskId}</if>
@@ -122,7 +122,7 @@
     <!--检索+同音字-->
     <select id="searchDaQyzList" parameterType="DaQyz" resultMap="DaQyzResult">
         select distinct q.* from da_qyz q
-        left join da_user_catalog uc on q.mu_id = uc.mu_id
+        <if test="userId != null  ">left join da_user_catalog uc on q.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null">and uc.user_id = #{userId}</if>
             <if test="name1 != null  and name1 != ''">
@@ -159,7 +159,7 @@
     <!--检索+无同音字-->
     <select id="searchDaQyzList1" parameterType="DaQyz" resultMap="DaQyzResult">
         select distinct q.* from da_qyz q
-        left join da_user_catalog uc on q.mu_id = uc.mu_id
+        <if test="userId != null  ">left join da_user_catalog uc on q.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null">and uc.user_id = #{userId}</if>
             <if test="name1 != null  and name1 != ''">
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml
index c658c55..dd36188 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaTaskMapper.xml
@@ -36,7 +36,7 @@
 
     <select id="selectDaTaskList" parameterType="DaTask" resultMap="DaTaskResult">
         select distinct  t.* from da_task t
-        left join da_user_catalog uc on t.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on t.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null"> and uc.user_id = #{userId}</if>
             <if test="muId != null "> and mu_id = #{muId}</if>
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml
index 94ad905..00e1f9b 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaYtzmMapper.xml
@@ -48,7 +48,7 @@
 
     <select id="selectDaYtzmList" parameterType="DaYtzm" resultMap="DaYtzmResult">
         select distinct y.* from da_ytzm y
-        left join da_user_catalog uc on y.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on y.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="taskId != null ">and task_id = #{taskId}</if>
@@ -105,7 +105,7 @@
     <!--检索+同音字-->
     <select id="searchYtzmList" parameterType="DaYtzm" resultMap="DaYtzmResult">
         select distinct y.* from da_ytzm y
-        left join da_user_catalog uc on y.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on y.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="wName != null  and wName != ''">
@@ -131,7 +131,7 @@
     <!--检索+无同音字-->
     <select id="searchYtzmList1" parameterType="DaYtzm" resultMap="DaYtzmResult">
         select distinct y.* from da_ytzm y
-        left join da_user_catalog uc on y.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on y.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="wName != null  and wName != ''">
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml
index 11e18c1..216b040 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaZfnyhkcgMapper.xml
@@ -54,7 +54,7 @@
 
     <select id="selectDaZfnyhkcgList" parameterType="DaZfnyhkcg" resultMap="DaZfnyhkcgResult">
         select distinct z.* from da_zfnyhkcg z
-        left join da_user_catalog uc on z.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on z.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null ">and uc.user_id = #{userId}</if>
             <if test="taskId != null ">and task_id = #{taskId}</if>
@@ -127,7 +127,7 @@
     <!--检索+同音字-->
     <select id="searchDaZfnyhkcgList" parameterType="DaZfnyhkcg" resultMap="DaZfnyhkcgResult">
         select distinct z.* from da_zfnyhkcg z
-        left join da_user_catalog uc on z.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on z.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null ">and uc.user_id = #{userId}</if>
             <if test="name != null  and name != ''">
@@ -170,7 +170,7 @@
     <!--检索+无同音字-->
     <select id="searchDaZfnyhkcgList1" parameterType="DaZfnyhkcg" resultMap="DaZfnyhkcgResult">
         select distinct z.* from da_zfnyhkcg z
-        left join da_user_catalog uc on z.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on z.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null ">and uc.user_id = #{userId}</if>
             <if test="name != null  and name != ''">
diff --git a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml
index aeeee0c..0d9863d 100644
--- a/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml
+++ b/dangan-dangan/src/main/resources/mapper/dangan/DaZqzMapper.xml
@@ -63,7 +63,7 @@
 
     <select id="selectDaZqzList" parameterType="DaZqz" resultMap="DaZqzResult">
         select distinct z.* from da_zqz z
-        left join da_user_catalog uc on z.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on z.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="taskId != null ">and task_id = #{taskId}</if>
@@ -138,7 +138,7 @@
     <!--检索+同音字-->
     <select id="searchDaZqzList" parameterType="DaZqz" resultMap="DaZqzResult">
         select distinct z.* from da_zqz z
-        left join da_user_catalog uc on z.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on z.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="name != null  and name != ''">
@@ -185,7 +185,7 @@
     <!--检索+无同音字-->
     <select id="searchDaZqzList1" parameterType="DaZqz" resultMap="DaZqzResult">
         select distinct z.* from da_zqz z
-        left join da_user_catalog uc on z.mu_id = uc.mu_id
+        <if test="userId != null  "> left join da_user_catalog uc on z.mu_id = uc.mu_id</if>
         <where>
             <if test="userId != null  ">and uc.user_id = #{userId}</if>
             <if test="name != null  and name != ''">