[新增] 权限申请流程 及 工作台的接口 开发完毕

adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml

@@ -170,12 +170,33 @@
 
 
     <select id="getAddReportPage" resultType="com.adc.da.report.vo.ReportVo">
-        SELECT a.*
-        from (
-          select * from TT_REPORT_MANAGE eo
-                            LEFT JOIN tr_report_user ru on eo.id = ru.reportId
-          WHERE eo.DEL_FLAG = 0 and ru.userId != #{pageVO.usid}
 
+        SELECT
+        eo.id,
+        eo.NAME,
+        eo.keycontent,
+        eo.maincontent,
+        eo.DEPARTMENT,
+        eo.YEAR,
+        eo.fileid,
+        eo.confidentialLevel,
+        eo.privacyLevel,
+        pa.report_id,
+        pa.user_id
+        FROM
+        TT_REPORT_MANAGE eo
+        LEFT JOIN tr_report_user ru ON eo.id = ru.reportId
+        LEFT JOIN power_apply pa ON pa.report_id = eo.id
+        WHERE
+        eo.DEL_FLAG = 0
+        <if test="pageVO.usid !='' and pageVO.usid != null">
+            and ru.userId != #{pageVO.usid}
+        </if>
+        <if test="pageVO.usid !='' and pageVO.usid != null">
+            and eo.id not in (
+            SELECT tt.report_id from power_apply tt WHERE tt.user_id = #{pageVO.usid}
+            )
+        </if>
         <if test="pageVO.name !='' and pageVO.name != null">
             and name like  CONCAT(CONCAT('%',#{pageVO.name}),'%')
         </if>
@@ -186,11 +207,21 @@
                 #{year}
             </foreach>
         </if>
-                      ) a
 
-       LEFT JOIN power_apply pa on pa.report_id = a.id
-        where
-            pa.user_id is null or pa.user_id != #{pageVO.usid}
+        <if test="pageVO.ids != null and pageVO.ids.size() > 0">
+            and eo.id in
+            <foreach collection="pageVO.ids" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        GROUP BY
+        eo.id
+        ORDER BY
+        eo.updateDate DESC
+
+
+
+
 
     </select>