4/15 queryTicket

src/main/java/com/example/xiaoshiweixinback/entity/dto/ticket/TicketQueryDTO.java

@@ -12,5 +12,4 @@ public class TicketQueryDTO {
     private Integer id;
     private Integer current;
     private Integer size;
-    private Boolean isAdmin;
 }

src/main/java/com/example/xiaoshiweixinback/service/TicketService.java

@@ -117,9 +117,6 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
         String num = ticketQueryDTO.getNum();
         Integer ticketType = ticketQueryDTO.getTicketType();
         Integer process = ticketQueryDTO.getProcess();
-
-        Boolean isAdmin = ticketQueryDTO.getIsAdmin();
-
         Integer pageNum = ticketQueryDTO.getCurrent();
         Integer pageSize = ticketQueryDTO.getSize();
 
@@ -134,12 +131,10 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
         if (process != null) {
             queryWrapper.lambda().eq(Ticket::getTicketProgress, process);
         }
-        if (isAdmin != null && !isAdmin.equals(true)) {
-            PersonnelVO personnelVO = cacheUtil.getLoginUser(LoginUtils.getToken());
-            Integer personType = personnelVO.getPersonType();
-            if (personType != null && personType.equals(0)) {
-                queryWrapper.lambda().eq(Ticket::getCreateId, personnelVO.getUuid());
-            }
+        PersonnelVO personnelVO = cacheUtil.getLoginUser(LoginUtils.getToken());
+        Integer personType = personnelVO.getPersonType();
+        if (personType != null && personType.equals(1)) {
+            queryWrapper.lambda().eq(Ticket::getCreateId, personnelVO.getUuid());
         }
         queryWrapper.orderBy(true, false, "create_time");
         IPage<Ticket> ticketPage = this.page(page, queryWrapper);