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

feat(service): 添加可报价字段的查询和请求支持 

- 在 AdminUserServiceImpl 中增加根据 canQuotation 字段过滤用户的条件
- 在 SearchAccountRequest 请求体中添加 canQuotation 字段
- 修正部分代码格式，提高代码可读性
- 保持分页查询结果中的相关属性映射正确处理
This commit is contained in:
曹鹏飞 2026-05-26 17:31:48 +08:00
parent 9966cff8ce
commit 705202436d
2 changed files with 9 additions and 3 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/SearchAccountRequest.java
View File

@ -26,4 +26,9 @@ public class SearchAccountRequest extends PageRequest {
* 当按部门查询时，是否显示其所有子部门下所有用户，默认为不显示 * 当按部门查询时，是否显示其所有子部门下所有用户，默认为不显示
*/ */
private Boolean showAllDepartmentUser = false; private Boolean showAllDepartmentUser = false;
/**
* 是否可报价
*/
private Boolean canQuotation;
} }

7
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AdminUserServiceImpl.java
View File

@ -178,6 +178,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
.eq(Objects.nonNull(request.getState()), AdminUser::getState, request.getState()) .eq(Objects.nonNull(request.getState()), AdminUser::getState, request.getState())
.in(CollectionUtil.isNotEmpty(departmentIds), AdminUser::getDepartmentId, departmentIds) .in(CollectionUtil.isNotEmpty(departmentIds), AdminUser::getDepartmentId, departmentIds)
.eq(Objects.nonNull(request.getGongfuHandler()), AdminUser::isGongFuHandler, request.getGongfuHandler()) .eq(Objects.nonNull(request.getGongfuHandler()), AdminUser::isGongFuHandler, request.getGongfuHandler())
.isNotNull(Objects.equals(true, request.getCanQuotation()), AdminUser::getCategoryId)
.like(StrUtil.isNotBlank(request.getLoginName()), AdminUser::getLoginName, request.getLoginName()) .like(StrUtil.isNotBlank(request.getLoginName()), AdminUser::getLoginName, request.getLoginName())
.like(StrUtil.isNotBlank(request.getUserName()), AdminUser::getUserName, request.getUserName()) .like(StrUtil.isNotBlank(request.getUserName()), AdminUser::getUserName, request.getUserName())
.orderByAsc(AdminUser::getState) .orderByAsc(AdminUser::getState)
@ -196,8 +197,8 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
.filter(Objects::nonNull) .filter(Objects::nonNull)
.collect(Collectors.toList()); .collect(Collectors.toList());
List<DictionaryItem> categories = CollectionUtil.isEmpty(categoryIds) ? Collections.emptyList() : dictionaryItemService.lambdaQuery() List<DictionaryItem> categories = CollectionUtil.isEmpty(categoryIds) ? Collections.emptyList() : dictionaryItemService.lambdaQuery()
.in(DictionaryItem::getId, categoryIds) .in(DictionaryItem::getId, categoryIds)
.list(); .list();
pageData.setItems(page.getRecords().stream().map(u -> { pageData.setItems(page.getRecords().stream().map(u -> {
AdminUser userCreate = users.stream() AdminUser userCreate = users.stream()
.filter(it -> Objects.equals(it.getId(), u.getCreateBy())) .filter(it -> Objects.equals(it.getId(), u.getCreateBy()))
@ -256,7 +257,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
.map(r -> new RoleSimpleVO().setId(r.getId()).setName(r.getName())) .map(r -> new RoleSimpleVO().setId(r.getId()).setName(r.getName()))
.collect(Collectors.toSet()) .collect(Collectors.toSet())
) )
.setAreaIds(Arrays.stream(StrUtil.splitToInt(u.getAreaIds(),",")).boxed().collect(Collectors.toList())); .setAreaIds(Arrays.stream(StrUtil.splitToInt(u.getAreaIds(), ",")).boxed().collect(Collectors.toList()));
}).collect(Collectors.toList())); }).collect(Collectors.toList()));
return pageData; return pageData;
} }