1

src/main/java/com/fdkankan/manage_jp/service/impl/UserServiceImpl.java

@@ -161,16 +161,11 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Override
     public Object pageList(UserListParam param,User user) {
-        LambdaQueryWrapper<User> wrapper = new LambdaQueryWrapper<>();
-        if(StringUtils.isNotBlank(param.getPhoneNum())){
-            wrapper.like(User::getUserName,param.getPhoneNum());
-        }
 
         Set<Long> roleIds = userRoleService.getByUser(user);
         if(roleIds.contains(6L)){
-            wrapper.eq(User::getCompanyId,user.getCompanyId());
+            param.setCompanyId(user.getCompanyId());
         }
-        wrapper.orderByDesc(User::getCreateTime);
         Page<UserExcelVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(), param.getPageSize()),param);
         for (UserExcelVo record : page.getRecords()) {
             List<UserPlatform> userPlatforms = userPlatformService.getByUserId(record.getId());

src/main/java/com/fdkankan/manage_jp/vo/request/UserListParam.java

@@ -6,6 +6,6 @@ import lombok.Data;
 @Data
 public class UserListParam extends RequestBase {
     private String phoneNum;
-
     private String companyName;
+    private Long companyId;
 }

src/main/resources/mapper/manage_jp/UserMapper.xml

@@ -29,6 +29,9 @@
         <if test="param.phoneNum != null and param.phoneNum!=''">
             and u.user_name like concat ('%',#{param.phoneNum},'%')
         </if>
+        <if test="param.companyId != null ">
+            and c.id = #{param.companyId}
+        </if>
         order by u.id desc,u.create_time desc
     </sql>
 </mapper>