bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

系统优化

This commit is contained in:
mashuai 2025-03-27 14:04:10 +08:00
parent 5ece3f4368
commit 74797e8d62
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
View File

@ -44,7 +44,11 @@ public class BackReceiveServiceImpl implements BackReceiveService {
@Override @Override
public List<BackApplyInfo> getbackReceiveList(BackApplyInfo record) { public List<BackApplyInfo> getbackReceiveList(BackApplyInfo record) {
List<BackApplyInfo> backApplyInfoList = backReceiveMapper.getbackReceiveList(record); List<BackApplyInfo> backApplyInfoList = backReceiveMapper.getbackReceiveList(record);
if (SecurityUtils.getLoginUser().getRoles().contains("admin")) { // 定义需要匹配的角色集合
List<String> allowedRoles = Arrays.asList("admin", "em01", "em02", "jjbz", "dm01", "dm07");
// 获取当前用户的角色集合
Set<String> userRoles = SecurityUtils.getLoginUser().getRoles();
if (userRoles != null && allowedRoles.stream().anyMatch(userRoles::contains)) {
return backApplyInfoList; return backApplyInfoList;
} }
List<BackApplyInfo> backApplyInfos = new ArrayList<>(); List<BackApplyInfo> backApplyInfos = new ArrayList<>();
@ -85,7 +89,11 @@ public class BackReceiveServiceImpl implements BackReceiveService {
List<BackApplyInfo> list = new ArrayList<>(); List<BackApplyInfo> list = new ArrayList<>();
List<Long> longs = new ArrayList<>(); List<Long> longs = new ArrayList<>();
List<BackApplyInfo> backApplyInfoList = backReceiveMapper.receiveView(record); List<BackApplyInfo> backApplyInfoList = backReceiveMapper.receiveView(record);
if (SecurityUtils.getLoginUser().getRoles().contains("admin")) { // 定义需要匹配的角色集合
List<String> allowedRoles = Arrays.asList("admin", "em01", "em02", "jjbz", "dm01", "dm07");
// 获取当前用户的角色集合
Set<String> userRoles = SecurityUtils.getLoginUser().getRoles();
if (userRoles != null && allowedRoles.stream().anyMatch(userRoles::contains)) {
return backApplyInfoList; return backApplyInfoList;
} }
if (CollectionUtils.isNotEmpty(backApplyInfoList)) { if (CollectionUtils.isNotEmpty(backApplyInfoList)) {

2
sgzb-modules/sgzb-material/src/main/resources/mapper/material/StorageStatusMapper.xml
View File

@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id LEFT JOIN ma_type mt ON mt.type_id = bcd.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
where (bcd.status = '1' or bcd.status is null) WHERE bcd.is_finished IS NOT NULL and bcd.is_finished = '1'
GROUP BY GROUP BY
mt.type_id mt.type_id
) AS subquery2 ON subquery1.type_id = subquery2.type_id ) AS subquery2 ON subquery1.type_id = subquery2.type_id

1
sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmStorageLogMapper.xml
View File

@ -65,6 +65,7 @@
and mt1.type_name like concat('%', #{typeName}, '%') and mt1.type_name like concat('%', #{typeName}, '%')
</if> </if>
</where> </where>
order by bsl.create_time desc
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">