From bb415c9b701286e8438761fc66a4122a127e104f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 18 Aug 2025 17:55:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20bug-574=20=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=95=86=E5=AD=90=E8=B4=A6=E5=8F=B7=E4=B9=9F=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8E=88=E6=9D=83=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/service/impl/AppUserServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java index f67fe958..1a8f1563 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java @@ -406,6 +406,11 @@ public class AppUserServiceImpl extends ServiceImpl impl it.setRoles(getRoles(it.getId())); } }); + subs.forEach(it -> { + if (it.getKey().startsWith("u-")) { + it.setRoles(getRoles(it.getId())); + } + }); return new PageData().setPage(request.getPage()).setPageSize(request.getPageSize()).setTotal(primarys.size()).setItems(page); } From 3b80984bcc942eb485b96155784743682773570f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 25 Aug 2025 09:33:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20bug-612=20=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AFAPP=EF=BC=8C=E5=AE=89=E5=8D=93=E5=8F=8A=E8=8B=B9?= =?UTF-8?q?=E6=9E=9C=E7=AB=AF=EF=BC=8C=E5=BE=85=E5=A4=84=E7=90=86=E7=9A=84?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=A8=EF=BC=8C=E8=BE=93=E5=85=A5=E4=BB=BB?= =?UTF-8?q?=E4=BD=95=E5=85=B3=E9=94=AE=E8=AF=8D=E9=83=BD=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E4=B8=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/pojo/request/AdminTicketSearchRequest.java | 5 +++++ .../src/main/resources/mapper/TicketMapper.xml | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java index 18be83e0..b103b7f2 100644 --- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java +++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AdminTicketSearchRequest.java @@ -35,4 +35,9 @@ public class AdminTicketSearchRequest extends TicketSearchRequest { //代理商编码 private String agentCode; + + /** + * 搜索关键字，同时搜索标题、设备编号、设备机型、问题描述、问题部位 + */ + private String key; } \ No newline at end of file diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml index 589bd792..43711562 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml @@ -80,6 +80,14 @@ AND d.customer_name LIKE CONCAT('%', #{request.createUserName}, '%') + + AND (t.title LIKE CONCAT('%', #{request.key}, '%') + or t.device_no LIKE CONCAT('%', #{request.key}, '%') + or d.model_no LIKE CONCAT('%', #{request.key}, '%') + or t.description LIKE CONCAT('%', #{request.key},'%') + or p.part_name LIKE CONCAT('%', #{request.key}, '%') + ) +