Merge remote-tracking branch 'origin/master'

2025-11-08 19:53:47 +08:00 · 2023-05-10 20:09:42 +08:00
parent 05e91f7786 c7501c7f36
commit 3693856a05
14 changed files with 143 additions and 132 deletions
--- a/smart-admin-api/pom.xml
+++ b/smart-admin-api/pom.xml
@@ -16,6 +16,8 @@
    </modules>

    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
        <springboot.version>2.7.5</springboot.version>
        <spring-mock.version>2.0.8</spring-mock.version>
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java
@@ -102,7 +102,7 @@ public class NoticeEmployeeService {
        }

        EmployeeEntity employeeEntity = employeeService.getById(requestEmployeeId);
-        if (!updateFormVO.getAllVisibleFlag() && checkVisibleRange(updateFormVO.getVisibleRangeList(), requestEmployeeId, employeeEntity.getDepartmentId())) {
+        if (!updateFormVO.getAllVisibleFlag() && !checkVisibleRange(updateFormVO.getVisibleRangeList(), requestEmployeeId, employeeEntity.getDepartmentId())) {
            return ResponseDTO.userErrorParam("对不起，您没有权限查看内容");
        }

--- a/smart-admin-api/sa-admin/src/main/resources/dev/application.yaml
+++ b/smart-admin-api/sa-admin/src/main/resources/dev/application.yaml
@@ -2,14 +2,24 @@ server:
  servlet:
    context-path: '/'
  port: 1024
+  # tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
+  tomcat:
+    basedir: ${localPath:/home}/logs/smart_admin_v2/dev/tomcat-logs
+    accesslog:
+      enabled: true
+      pattern: '%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)'
+
 spring:
  profiles:
    active: '@profiles.active@'
+
 # 项目配置
 project:
  name: sa-admin
  module: net.lab1024.sa.admin.module
+
 # swagger文档
 swagger:
  host: localhost:${server.port}
-  tag-class: net.lab1024.sa.admin.constant.AdminSwaggerTagConst
+  tag-class: net.lab1024.sa.admin.constant.AdminSwaggerTagConst
+
--- a/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml
+++ b/smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml
@@ -95,25 +95,27 @@
        left join t_notice_type on t_notice.notice_type_id = t_notice_type.notice_type_id
        <where>
            <if test="!administratorFlag">
+            (
                t_notice.notice_id in
                (select t_notice_visible_range.notice_id
                from t_notice_visible_range
                where
-                (t_notice_visible_range.data_type = #{departmentDataType}
-                <if test="requestEmployeeDepartmentIdList != null and requestEmployeeDepartmentIdList.size > 0">
-                    and
-                    t_notice_visible_range.data_id
-                    in
-                    <foreach collection="requestEmployeeDepartmentIdList" open="(" close=")" separator="," item="item">
-                        #{item}
-                    </foreach>
-                </if>
-                )
-                or ( t_notice_visible_range.data_type = #{employeeDataType} and t_notice_visible_range.data_id =
-                #{requestEmployeeId} )
+                ( t_notice_visible_range.data_type = #{departmentDataType}
+                    <if test="requestEmployeeDepartmentIdList != null and requestEmployeeDepartmentIdList.size > 0">
+                        and
+                        t_notice_visible_range.data_id
+                        in
+                        <foreach collection="requestEmployeeDepartmentIdList" open="(" close=")" separator="," item="item">
+                            #{item}
+                        </foreach>
+                    </if>
+                    )
+                    or ( t_notice_visible_range.data_type = #{employeeDataType} and t_notice_visible_range.data_id = #{requestEmployeeId} )
                )
+                or t_notice.all_visible_flag = true
+            )
            </if>
-            and t_notice.all_visible_flag = true
+
            and t_notice.deleted_flag = #{deletedFlag}
            and t_notice.publish_time &lt; now()
            <if test="query.noticeTypeId != null">
--- a/smart-admin-api/sa-admin/src/main/resources/pre/application.yaml
+++ b/smart-admin-api/sa-admin/src/main/resources/pre/application.yaml
@@ -2,14 +2,24 @@ server:
  servlet:
    context-path: '/'
  port: 1024
+  # tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
+  tomcat:
+    basedir: ${localPath:/home}/logs/smart_admin_v2/pre/tomcat-logs
+    accesslog:
+      enabled: true
+      pattern: '%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)'
+
 spring:
  profiles:
    active: '@profiles.active@'
+
 # 项目配置
 project:
  name: sa-admin
  module: net.lab1024.sa.admin.module
+
 # swagger文档
 swagger:
  host: localhost:${server.port}
-  tag-class: net.lab1024.sa.admin.constant.AdminSwaggerTagConst
+  tag-class: net.lab1024.sa.admin.constant.AdminSwaggerTagConst
+
--- a/smart-admin-api/sa-admin/src/main/resources/prod/application.yaml
+++ b/smart-admin-api/sa-admin/src/main/resources/prod/application.yaml
@@ -2,14 +2,24 @@ server:
  servlet:
    context-path: '/'
  port: 1024
+  # tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
+  tomcat:
+    basedir: ${localPath:/home}/logs/smart_admin_v2/prod/tomcat-logs
+    accesslog:
+      enabled: true
+      pattern: '%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)'
+
 spring:
  profiles:
    active: '@profiles.active@'
+
 # 项目配置
 project:
  name: sa-admin
  module: net.lab1024.sa.admin.module
+
 # swagger文档
 swagger:
  host: localhost:${server.port}
-  tag-class: net.lab1024.sa.admin.constant.AdminSwaggerTagConst
+  tag-class: net.lab1024.sa.admin.constant.AdminSwaggerTagConst
+
--- a/smart-admin-api/sa-admin/src/main/resources/test/application.yaml
+++ b/smart-admin-api/sa-admin/src/main/resources/test/application.yaml
@@ -2,14 +2,24 @@ server:
  servlet:
    context-path: '/'
  port: 1024
+  # tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
+  tomcat:
+    basedir: ${localPath:/home}/logs/smart_admin_v2/test/tomcat-logs
+    accesslog:
+      enabled: true
+      pattern: '%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)'
+
 spring:
  profiles:
    active: '@profiles.active@'
+
 # 项目配置
 project:
  name: sa-admin
  module: net.lab1024.sa.admin.module
+
 # swagger文档
 swagger:
  host: localhost:${server.port}
-  tag-class: net.lab1024.sa.admin.constant.AdminSwaggerTagConst
+  tag-class: net.lab1024.sa.admin.constant.AdminSwaggerTagConst
+
--- a/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/operatelog/core/OperateLogAspect.java
+++ b/smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/operatelog/core/OperateLogAspect.java
@@ -1,13 +1,11 @@
 package net.lab1024.sa.common.module.support.operatelog.core;

 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import net.lab1024.sa.common.common.constant.RequestHeaderConst;
 import net.lab1024.sa.common.common.domain.RequestUser;
 import net.lab1024.sa.common.common.util.SmartRequestUtil;
 import net.lab1024.sa.common.module.support.operatelog.OperateLogDao;
--- a/smart-admin-api/sa-common/src/main/resources/code-generator-template/js/list.vue.vm
+++ b/smart-admin-api/sa-common/src/main/resources/code-generator-template/js/list.vue.vm
@@ -44,13 +44,13 @@
            <a-form-item class="smart-query-form-item">
                <a-button type="primary" @click="queryData">
                    <template #icon>
-                        <ReloadOutlined />
+                        <SearchOutlined />
                    </template>
                    查询
                </a-button>
                <a-button @click="resetQuery" class="smart-margin-left10">
                    <template #icon>
-                        <SearchOutlined />
+                        <ReloadOutlined />
                    </template>
                    重置
                </a-button>
--- a/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml
+++ b/smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml
@@ -3,7 +3,7 @@ spring:
  datasource:
    url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v2?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
    username: root
-    password: Xxxx1024
+    password: Zhuoda1024lab
    initial-size: 2
    min-idle: 2
    max-active: 10
@@ -61,14 +61,6 @@ spring:
  cache:
    type: caffeine

-# tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
-server:
-  tomcat:
-    basedir: ${localPath:/home}/logs/smart_admin_v2/tomcat-logs
-    accesslog:
-      enabled: true
-      pattern: '%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)'
-
 #swagger: 提高swagger 方法名称有重复的日志提示
 logging:
  level:
--- a/smart-admin-api/sa-common/src/main/resources/pre/sa-common.yaml
+++ b/smart-admin-api/sa-common/src/main/resources/pre/sa-common.yaml
@@ -1,7 +1,7 @@
 spring:
  # 数据库连接信息
  datasource:
-    url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v2_pre?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://127.0.0.1:3306/smart_admin_v2_pre?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
    username: root
    password: Zhuoda123456
    initial-size: 5
@@ -61,14 +61,6 @@ spring:
  cache:
    type: caffeine

-# tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
-server:
-  tomcat:
-    basedir: ${localPath:/home}/logs/smart_admin_v2/tomcat-logs
-    accesslog:
-      enabled: true
-      pattern: '%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)'
-
 #swagger: 提高swagger 方法名称有重复的日志提示
 logging:
  level:
--- a/smart-admin-api/sa-common/src/main/resources/prod/sa-common.yaml
+++ b/smart-admin-api/sa-common/src/main/resources/prod/sa-common.yaml
@@ -61,14 +61,6 @@ spring:
  cache:
    type: caffeine

-# tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
-server:
-  tomcat:
-    basedir: ${localPath:/home}/logs/smart_admin_v2/tomcat-logs
-    accesslog:
-      enabled: true
-      pattern: '%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)'
-
 #swagger: 提高swagger 方法名称有重复的日志提示
 logging:
  level:
--- a/smart-admin-api/sa-common/src/main/resources/test/sa-common.yaml
+++ b/smart-admin-api/sa-common/src/main/resources/test/sa-common.yaml
@@ -61,13 +61,6 @@ spring:
  cache:
    type: caffeine

-# tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
-server:
-  tomcat:
-    basedir: ${localPath:/home}/logs/smart_admin_v2/tomcat-logs
-    accesslog:
-      enabled: true
-      pattern: '%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)'

 #swagger: 提高swagger 方法名称有重复的日志提示
 logging: