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 @@ + + + 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}) + \ No newline at end of file