From 2b30413796c6e5bb7d44b51dcb32cbf3d37aec4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 24 Feb 2022 22:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=99=BB=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsh/erp/config/TenantConfig.java   | 2 ++
 .../main/java/com/jsh/erp/controller/UserController.java | 1 +
 .../java/com/jsh/erp/datasource/mappers/LogMapperEx.java | 2 ++
 .../main/java/com/jsh/erp/service/log/LogService.java    | 2 +-
 .../src/main/resources/mapper_xml/LogMapperEx.xml        | 9 +++++++++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/config/TenantConfig.java b/jshERP-boot/src/main/java/com/jsh/erp/config/TenantConfig.java
index c6bcab4b3..e9f730f38 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/config/TenantConfig.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/config/TenantConfig.java
@@ -77,6 +77,8 @@ public class TenantConfig {
                     return true;
                 } else if ("com.jsh.erp.datasource.mappers.RoleMapperEx.getRoleWithoutTenant".equals(ms.getId())) {
                     return true;
+                } else if ("com.jsh.erp.datasource.mappers.logMapperEx.insertLogWithUserId".equals(ms.getId())) {
+                    return true;
                 }
                 return false;
             }
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
index 5bf5e5251..e14cd1f92 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
@@ -79,6 +79,7 @@ public class UserController {
         User user=null;
         BaseResponseInfo res = new BaseResponseInfo();
         try {
+
             String loginName = userParam.getLoginName().trim();
             String password = userParam.getPassword().trim();
             //判断用户是否已经登录过，登录过不再处理
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java
index 3f7cfcf99..7c4d76696 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java
@@ -33,4 +33,6 @@ public interface LogMapperEx {
             @Param("moduleName") String moduleName,
             @Param("clientIp") String clientIp,
             @Param("createTime") String createTime);
+
+    int insertLogWithUserId(Log log);
 }
\ No newline at end of file
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java
index 6c2136407..fdba2a250 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java
@@ -183,7 +183,7 @@ public class LogService {
                 log.setStatus(status);
                 log.setContent(content);
                 log.setTenantId(tenantId);
-                logMapper.insertSelective(log);
+                logMapperEx.insertLogWithUserId(log);
             }
         }catch(Exception e){
             JshException.writeFail(logger, e);
diff --git a/jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml
index 3d2bafa11..6ff4bb4f1 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml
@@ -77,4 +77,13 @@
     <select id="getCountByIpAndDate" resultType="java.lang.Long">
         select count(1) from jsh_log where operation=#{moduleName} and client_ip=#{clientIp} and create_time=#{createTime}
     </select>
+
+    <insert id="insertLogWithUserId" parameterType="com.jsh.erp.datasource.entities.Log">
+        insert into jsh_log (user_id, operation,
+                             client_ip, create_time, status,
+                             content, tenant_id)
+        values (#{userId,jdbcType=BIGINT}, #{operation,jdbcType=VARCHAR},
+                #{clientIp,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{status,jdbcType=TINYINT},
+                #{content,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
+    </insert>
 </mapper>
\ No newline at end of file