后台bug修改

44323

2023-11-09 4f47865c3b8132f097cc32fe9bd8e0fa12469786

 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java

@@ -30,6 +30,7 @@
import java.io.PrintWriter;
import java.util.*;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @author zhibing.pu
@@ -62,6 +63,7 @@
    public List<TAppUser> queryAppUserList(@RequestBody AppUserByNameAndPhoneDTO dto){
        return appUserService.queryAPPUserByNameAndPhone(dto);
    }

    /**
     * 根据用户姓名和电话模糊查询
     */
@@ -116,8 +118,12 @@
    @ResponseBody
    @RequestMapping("/base/appUser/listAll")
    public List<QueryAppUserVO> listAll(@RequestBody QueryAppUser query){

        return appUserService.listAll(query);
        List<QueryAppUserVO> queryAppUserVOS = appUserService.listAll(query);
        if (query.getUserIds()!=null && query.getUserIds().size()!=0){
            List<QueryAppUserVO> queryAppUserVOS1 = appUserService.listAll1(query);
            queryAppUserVOS.addAll(queryAppUserVOS1);
        }
        return queryAppUserVOS.stream().distinct().collect(Collectors.toList());
    }

    /**