From eb03112af460e77f2b159f38fd4fef0aa83010b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Sun, 27 Apr 2025 10:27:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90bug-96=E3=80=91=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF=EF=BC=8C=E8=B4=A6=E5=8F=B7=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=BF=99=E9=87=8C=EF=BC=8C=E6=89=80=E5=B1=9E=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E8=B7=9F=E4=B8=8B=E4=B8=80=E8=A1=8C=E7=9A=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E4=BB=A3=E8=A1=A8=E5=86=85=E5=AE=B9=E9=87=8D=E5=8F=A0=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= =?UTF-8?q?=EF=BC=8C=E5=A4=9A=E4=BD=99=E7=9A=84=E5=B1=95=E7=A4=BA=E7=9C=81?= =?UTF-8?q?=E7=95=A5=E5=8F=B7=EF=BC=8C=E9=BC=A0=E6=A0=87=E6=94=BE=E4=B8=8A?= =?UTF-8?q?=E5=8E=BB=E6=98=BE=E7=A4=BA=E5=AE=8C=E6=95=B4=E7=9A=84=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 区域名称排重 --- .../mobilebroken/admin/controller/AppUserController.java | 7 ++----- .../repository/service/ITBaseCustomerService.java | 3 ++- .../service/impl/AppUserApplyforServiceImpl.java | 3 ++- .../repository/service/impl/TBaseCustomerServiceImpl.java | 5 +++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java index 90f1bdaf..cf946be3 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/AppUserController.java @@ -35,10 +35,7 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.time.Duration; import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.Base64; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -121,7 +118,7 @@ public class AppUserController extends ControllerBase { */ @GetMapping("getAreasByCompany") @ApiMark(moduleName = "代理商管理", apiName = "根据公司id获取区域列表",isPublic = true) - public ApiResult> getAreasByCompany(@Valid @RequestParam @NotNull List companyIds){ + public ApiResult> getAreasByCompany(@Valid @RequestParam @NotNull List companyIds){ return ApiResult.success(customerService.getAreas(companyIds)); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseCustomerService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseCustomerService.java index 7ba0fcd1..93c1a831 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseCustomerService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseCustomerService.java @@ -7,6 +7,7 @@ import com.nflg.mobilebroken.common.pojo.vo.CompanySimpleVO; import com.nflg.mobilebroken.repository.entity.TBaseCustomer; import org.apache.ibatis.annotations.Param; +import java.util.Collection; import java.util.List; /** @@ -30,5 +31,5 @@ public interface ITBaseCustomerService extends IService { List getSimpleCompanysFromAdmin(Integer userId); - List getAreas(List companyIds); + Collection getAreas(List companyIds); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java index aae54b29..41bfdbc5 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java @@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.Arrays; +import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -172,7 +173,7 @@ public class AppUserApplyforServiceImpl extends ServiceImpl areas=customerService.getAreas(Arrays.stream(appUser.getCompanyId().split(",")).map(Integer::parseInt).collect(Collectors.toList())); + Collection areas=customerService.getAreas(Arrays.stream(appUser.getCompanyId().split(",")).map(Integer::parseInt).collect(Collectors.toList())); vo.setUser(new AppUserVO() .setAreaName(StrUtil.join(",",areas)) .setSalesUserName(appUser.getSalesUserName()) diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseCustomerServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseCustomerServiceImpl.java index cf16fea2..bf2a8bd0 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseCustomerServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseCustomerServiceImpl.java @@ -15,6 +15,7 @@ import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -105,7 +106,7 @@ public class TBaseCustomerServiceImpl extends ServiceImpl getAreas(List companyIds) { + public Collection getAreas(List companyIds) { return lambdaQuery() .eq(TBaseCustomer::getDelIs, 0) .eq(TBaseCustomer::getEnableState, 1) @@ -114,6 +115,6 @@ public class TBaseCustomerServiceImpl extends ServiceImpl StrUtil.split(name, ",").stream()) - .collect(Collectors.toList()); + .collect(Collectors.toSet()); } }