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

退料库管权限限制

This commit is contained in:
mashuai 2025-02-18 10:41:01 +08:00
parent 539c46bbab
commit 86547bba1b
3 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
View File

@ -238,4 +238,14 @@ public class BackApplyInfo {
/** 操作后库存 */
private int postStoreNum;
/**
* 库管id字符集
*/
private String userId;
/**
* 库管id集合
*/
private List<Long> userIds;
}

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

@ -1,5 +1,6 @@
package com.bonus.sgzb.app.service.impl;
import com.alibaba.nacos.common.utils.CollectionUtils;
import com.bonus.sgzb.base.api.domain.BackApplyInfo;
import com.bonus.sgzb.app.domain.TmTask;
import com.bonus.sgzb.app.mapper.BackReceiveMapper;
@ -17,10 +18,8 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
/**
* @author hay
@ -61,8 +60,26 @@ public class BackReceiveServiceImpl implements BackReceiveService {
@Override
public List<BackApplyInfo> receiveView(BackApplyInfo record) {
Long userId = SecurityUtils.getUserId();
List<BackApplyInfo> list = new ArrayList<>();
List<Long> longs = new ArrayList<>();
List<BackApplyInfo> backApplyInfoList = backReceiveMapper.receiveView(record);
return backApplyInfoList;
if (SecurityUtils.getLoginUser().getRoles().contains("admin")) {
return backApplyInfoList;
}
if (CollectionUtils.isNotEmpty(backApplyInfoList)) {
for (BackApplyInfo backApplyInfo : backApplyInfoList) {
if (StringUtils.isNotBlank(backApplyInfo.getUserId())) {
List<String> strings = Arrays.asList(backApplyInfo.getUserId().split(","));
//转换为long类型
longs = strings.stream().map(Long::parseLong).collect(Collectors.toList());
}
if (longs.contains(userId)) {
list.add(backApplyInfo);
}
}
}
return list;
}
public List<BackApplyInfo> receiveView2(BackApplyInfo record) {

11
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -719,7 +719,8 @@
bb.finished_back_num,
mt.manage_type as manageType,
mt.company_id as companyId,
CONCAT('NSJJ',mt.`code`,mt.model_code) as `code`
CONCAT('NSJJ',mt.`code`,mt.model_code) as `code`,
mtk.userId as userId
FROM
back_apply_details bad
LEFT JOIN back_apply_info bai on bai.id=bad.parent_id
@ -746,6 +747,14 @@
parent_id=#{id} and is_finished = 1
GROUP BY type_id
) bb on bb.typeId=bad.type_id
LEFT JOIN (
SELECT
type_id as typeId,
GROUP_CONCAT(user_id) as userId
FROM
ma_type_keeper
GROUP BY type_id
) mtk ON mtk.typeId = bad.type_id
WHERE
bai.id=#{id}
<if test="typeId != null and typeId != ''">