From 9968cd58d532de6ce5ed035e00730f0e236511e7 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Tue, 16 Apr 2024 10:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=99=BB=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E6=8A=A5=E9=94=99/xml=E8=A1=A8=E4=B8=AD=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=A0=E9=99=A4=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/auth/AuthController.java |  3 +++
 .../dal/mysql/worklog/LogInstanceMapper.java  |  6 ------
 .../mapper/worklog/LogInstanceMapper.xml      | 20 -------------------
 .../mapper/worklog/LogStatisticsMapper.xml    |  5 ++++-
 .../mapper/worklog/WorkLogUseMapper.xml       |  7 +++++--
 5 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
index f1ee6018..4f7672d3 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
@@ -148,6 +148,7 @@ public class AuthController {
             @Parameter(name = "type", description = "社交类型", required = true),
             @Parameter(name = "redirectUri", description = "回调路径")
     })
+    @OperateLog(enable = false) // 避免 Post 请求被记录操作日志
     public CommonResult<String> socialLogin(@RequestParam("type") Integer type,
                                             @RequestParam("redirectUri") String redirectUri) {
         return success(socialClientService.getAuthorizeUrl(
@@ -165,6 +166,7 @@ public class AuthController {
     @PostMapping("/miniapp_quick_login")
     @PermitAll
     @Operation(summary = "微信小程序授权手机号快捷登陆", description = "微信小程序的手机号授权，快捷登陆" )
+    @OperateLog(enable = false) // 避免 Post 请求被记录操作日志
     public CommonResult<AuthLoginRespVO> miniAppQuickLogin(@RequestBody AuthSocialLoginReqVO reqVO) {
         return success(authService.miniAppQuickLogin(reqVO))  ;
     }
@@ -172,6 +174,7 @@ public class AuthController {
     @PostMapping("/miniapp_code2Session")
     @PermitAll
     @Operation(summary = "微信小程序openid", description = "获取微信小程序的openid" )
+    @OperateLog(enable = false) // 避免 Post 请求被记录操作日志
     public CommonResult<WxMaJscode2SessionResult> miniAppCode2Session(@RequestBody AuthSocialLoginReqVO reqVO) {
         return success(authService.miniAppCode2Session(reqVO))  ;
     }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java
index 9f304bc9..051099ca 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java
@@ -47,10 +47,4 @@ public interface LogInstanceMapper extends BaseMapperX<LogInstanceDO> {
 
     List<LogReadUserRespDTO> selectRaedUser(Long deptId);
 
-    /**
-     * 获取我管理的日志列表
-     *
-     * @return
-     */
-    List<LogInstanceDO> myManageLogInstanceByTimeRange(@Param("fromId") Long fromId, @Param("beginTime") Date beginTime, @Param("endTime") Date endTime);
 }
\ No newline at end of file
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml
index 8f34272b..d4d24127 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml
@@ -82,26 +82,6 @@
         or ( result.dept_id = #{deptId} and result.data_scope = 3 )
         or  result.data_scope = 1
     </select>
-    <select id="myManageLogInstanceByTimeRange"
-            resultType="cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogInstanceDO">
-        SELECT
-        a.*
-        FROM
-        work_log_instance_ext AS a
-        LEFT JOIN work_log_form AS b ON a.form_id = b.id
-        LEFT JOIN work_log_use AS d ON b.rule_id = d.id AND d.id > 0
-        <where>
-            <if test="fromId != null">
-                and a.form_id = #{fromId}
-            </if>
-            <if test="beginTime != null">
-                and a.create_time &gt;= #{beginTime}
-            </if>
-            <if test="endTime != null">
-                and a.create_time &lt;= #{endTime}
-            </if>
-        </where>
-    </select>
 
     <select id="selectPageResult" resultType="cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO">
         SELECT
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml
index 330976ef..7840c719 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml
@@ -15,7 +15,9 @@
                a.dept_id
         FROM system_users AS a
         LEFT JOIN work_log_use AS b ON a.id = b.use_user_id
-        WHERE b.form_id = #{formId}
+        WHERE
+          b.deleted = 0
+          and b.form_id = #{formId}
           AND not EXISTS (SELECT id
                           FROM work_log_instance_ext
                           WHERE form_id = b.form_id
@@ -98,6 +100,7 @@
             AND b.form_id = #{formId}
         </if>
         <where>
+            a.deleted = 0
             <if test="userId != null">
                 and a.use_user_id = #{userId}
             </if>
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/WorkLogUseMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/WorkLogUseMapper.xml
index b8d621c4..56117716 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/WorkLogUseMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/WorkLogUseMapper.xml
@@ -15,8 +15,9 @@
             DISTINCT form_id
         from work_log_use
         <where>
+            deleted = 0
             <if test="userId != null">
-                use_user_id = #{userId}
+               and use_user_id = #{userId}
             </if>
         </where>
     </select>
@@ -25,6 +26,8 @@
         select
             DISTINCT use_user_dept
         from work_log_use
-        where form_id = #{formId}
+        where
+            deleted = 0
+            and form_id = #{formId}
     </select>
 </mapper>
\ No newline at end of file