1024-lab/smart-admin
1
0
Fork 0
mirror of https://github.com/1024-lab/smart-admin.git synced 2025-09-09 09:49:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix issues

Browse Source
This commit is contained in:
zhuoda
2023-05-09 19:56:38 +08:00
parent 2328091c56
commit 86cae060b7
16 changed files with 146 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeEmployeeService.java
View File

@@ -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("对不起，您没有权限查看内容");
}

12
smart-admin-api/sa-admin/src/main/resources/dev/application.yaml
View File

@@ -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

28
smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml
View File

@@ -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">

12
smart-admin-api/sa-admin/src/main/resources/pre/application.yaml
View File

@@ -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

12
smart-admin-api/sa-admin/src/main/resources/prod/application.yaml
View File

@@ -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

12
smart-admin-api/sa-admin/src/main/resources/test/application.yaml
View File

@@ -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