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

feat: 一些调整

This commit is contained in:
曹鹏飞 2025-02-07 20:44:10 +08:00
parent 37ed0275e4
commit d733933fe1
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/UserSearchRequest.java
View File

@ -1,8 +1,11 @@
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;
import java.util.List;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
public class UserSearchRequest extends PageRequest{ public class UserSearchRequest extends PageRequest{
@ -14,5 +17,6 @@ public class UserSearchRequest extends PageRequest{
private Boolean enabled; private Boolean enabled;
//公司id //公司id
private Integer companyId; @JsonIgnore
private List<String> companyIds;
} }

6
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserServiceImpl.java
View File

@ -12,6 +12,7 @@ import com.nflg.mobilebroken.common.pojo.request.*;
import com.nflg.mobilebroken.common.pojo.vo.AppUserForAdminVO; import com.nflg.mobilebroken.common.pojo.vo.AppUserForAdminVO;
import com.nflg.mobilebroken.common.pojo.vo.AppUserVO; import com.nflg.mobilebroken.common.pojo.vo.AppUserVO;
import com.nflg.mobilebroken.common.util.AdminUserUtil; import com.nflg.mobilebroken.common.util.AdminUserUtil;
import com.nflg.mobilebroken.common.util.AppUserUtil;
import com.nflg.mobilebroken.common.util.PageUtil; import com.nflg.mobilebroken.common.util.PageUtil;
import com.nflg.mobilebroken.common.util.VUtils; import com.nflg.mobilebroken.common.util.VUtils;
import com.nflg.mobilebroken.repository.entity.AppArea; import com.nflg.mobilebroken.repository.entity.AppArea;
@ -58,6 +59,9 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
@Resource @Resource
private ITBaseCustomerService customerService; private ITBaseCustomerService customerService;
@Resource
private IAppUserService appUserService;
@Override @Override
public AppUser getUser(String userName, String password) { public AppUser getUser(String userName, String password) {
AppUser user = lambdaQuery() AppUser user = lambdaQuery()
@ -91,6 +95,8 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> impl
@Override @Override
public IPage<AppUserVO> search(UserSearchRequest request) { public IPage<AppUserVO> search(UserSearchRequest request) {
AppUser appUser = appUserService.getById(AppUserUtil.getUserId());
request.setCompanyIds(Arrays.stream(appUser.getCompanyId().split(",")).filter(StrUtil::isNotBlank).collect(Collectors.toList()));
return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize())); return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize()));
} }

5
nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
View File

@ -9,7 +9,10 @@
INNER JOIN app_area a ON u.area_id=a.id INNER JOIN app_area a ON u.area_id=a.id
LEFT JOIN app_user uc ON u.create_by=uc.id LEFT JOIN app_user uc ON u.create_by=uc.id
LEFT JOIN app_user uu ON u.update_by=uu.id LEFT JOIN app_user uu ON u.update_by=uu.id
WHERE u.company_id = #{request.companyId} WHERE u.is_primary=false AND u.company_id IN
<foreach collection="request.companyIds" item="companyId" open="(" separator="," close=")">
#{companyId}
</foreach>
<where> <where>
<if test="request.enabled != null"> <if test="request.enabled != null">
AND u.enabled = #{request.enabled} AND u.enabled = #{request.enabled}