toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix[project]: 修改同步待办权限相关

Browse Source
This commit is contained in:
lidongyang
2026-03-18 18:42:59 +08:00
parent 7078429738
commit 3937251313
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java
View File

@@ -168,4 +168,9 @@ public class SpdmTaskListReq {
*/
private String submitterName;
/**
* 利元亨定制，支持查询主题名（需求名）
*/
private String tag10;
}

7
project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java
View File

@@ -883,11 +883,12 @@ public class LyricInternalServiceImpl implements ILyricInternalService {
Map<String, List<UpdatePermissionReq>> permissionMap = updatePermissionList.stream().collect(Collectors.groupingBy(UpdatePermissionReq::getUuid));
for (Map.Entry<String, List<UpdatePermissionReq>> permissionEntry : permissionMap.entrySet()) {
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
Map<Long, Byte> userPermissions = new HashMap<>();
String uuid = permissionEntry.getKey();
Map<Long, Byte> userPermissions = new HashMap<>();
item.setUuid(uuid);
for (UpdatePermissionReq updatePermissionReq : permissionEntry.getValue()) {
userPermissions.put(updatePermissionReq.getUserId(), updatePermissionReq.getPermission());
List<UpdatePermissionReq> updatePermissionReqList = permissionEntry.getValue();
for (UpdatePermissionReq updatePermissionReq : updatePermissionReqList) {
userPermissions.putAll(updatePermissionReq.getUserPermissions());
}
item.setUserPermissions(userPermissions);
filePermissions.add(item);

7
project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
View File

@@ -4072,11 +4072,12 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
Map<String, List<UpdatePermissionReq>> permissionMap = permissionReqList.stream().collect(Collectors.groupingBy(UpdatePermissionReq::getUuid));
for (Map.Entry<String, List<UpdatePermissionReq>> permissionEntry : permissionMap.entrySet()) {
BatchUpdatePermissionReq.FilePermissionItem item = new BatchUpdatePermissionReq.FilePermissionItem();
Map<Long, Byte> userPermissions = new HashMap<>();
String uuid = permissionEntry.getKey();
Map<Long, Byte> userPermissions = new HashMap<>();
item.setUuid(uuid);
for (UpdatePermissionReq updatePermissionReq : permissionEntry.getValue()) {
userPermissions.put(updatePermissionReq.getUserId(), updatePermissionReq.getPermission());
List<UpdatePermissionReq> updatePermissionReqList = permissionEntry.getValue();
for (UpdatePermissionReq updatePermissionReq : updatePermissionReqList) {
userPermissions.putAll(updatePermissionReq.getUserPermissions());
}
item.setUserPermissions(userPermissions);
filePermissions.add(item);

3
project/src/main/resources/mapper/SimulationTaskMapper.xml
View File

@@ -780,6 +780,9 @@
<if test="req.expStatusValue != null and req.expStatusValue != ''">
and expStatus = #{req.expStatusValue}
</if>
<if test="req.tag10 != null and req.tag10 != ''">
and tag10 = #{req.tag10}
</if>
<if test="(req.exeStatusList != null and req.exeStatusList.size > 0) or (req.todayTmrTasks != null and req.todayTmrTasks != '')">
and (
<choose>