rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: bug-369 添加对产品线和数据权限的支持

This commit is contained in:
曹鹏飞 2025-06-25 10:44:30 +08:00
parent dcee2895e6
commit 61b9111d84
3 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java
View File

@ -1,6 +1,5 @@
package com.nflg.mobilebroken.common.pojo.request; package com.nflg.mobilebroken.common.pojo.request;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@ -23,10 +22,6 @@ public class AdminTicketSearchRequest extends TicketSearchRequest {
//质保状态 //质保状态
private Integer warrantyStatus; private Integer warrantyStatus;
//是否是工单管理者
@JsonIgnore
private boolean ticketManager;
//收藏夹id //收藏夹id
private Integer favouritesId; private Integer favouritesId;

4
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java
View File

@ -163,8 +163,6 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
if (Objects.nonNull(request.getEndTime())) { if (Objects.nonNull(request.getEndTime())) {
request.setEndTime(request.getEndTime().plusDays(1)); request.setEndTime(request.getEndTime().plusDays(1));
} }
List<Integer> tickerMangagers = adminUserService.getTickerMangagers();
request.setTicketManager(tickerMangagers.stream().anyMatch(uid -> Objects.equals(uid, userId)));
if (request.getType() == 2) { if (request.getType() == 2) {
return baseMapper.searchFromAdminAndFollow(request, userId,productionLines, new Page<>(request.getPage(), request.getPageSize())); return baseMapper.searchFromAdminAndFollow(request, userId,productionLines, new Page<>(request.getPage(), request.getPageSize()));
} else if (request.getType() == 4) { } else if (request.getType() == 4) {
@ -275,8 +273,6 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
return baseMapper.searchAllFromAdminAndFollow(request, AdminUserUtil.getUserId(),productionLines); return baseMapper.searchAllFromAdminAndFollow(request, AdminUserUtil.getUserId(),productionLines);
} else if (request.getType() == 4) { } else if (request.getType() == 4) {
Integer userId=AdminUserUtil.getUserId(); Integer userId=AdminUserUtil.getUserId();
List<Integer> tickerMangagers=adminUserService.getTickerMangagers();
request.setTicketManager(tickerMangagers.stream().anyMatch(uid -> Objects.equals(uid, userId)));
return baseMapper.searchAllFromAdmin(request, userId,productionLines); return baseMapper.searchAllFromAdmin(request, userId,productionLines);
} }
return Collections.emptyList(); return Collections.emptyList();

3
nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
View File

@ -44,9 +44,6 @@
#{plId} #{plId}
</foreach> </foreach>
</if> </if>
<if test="!request.ticketManager">
AND (FIND_IN_SET(#{userId},t.handle)>0 OR fun_inAduit(t.id,#{userId})=1)
</if>
<if test="request.state!=null"> <if test="request.state!=null">
AND t.state=#{request.state} AND t.state=#{request.state}
</if> </if>