10.23

nickchange

2023-10-23 12916db6e7946a31f4fbc5c48a27e7769683b034

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java

@@ -110,16 +110,23 @@
        List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
        String province = data.getProvince();
        TCity province1 = cityService.getOne(new QueryWrapper<TCity>().eq("name", data.getProvince()));

        if (province1!=null){
        List<TCity> city = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, province1.getId()));
            model.addAttribute("city",city);

        }
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
        if (data.getBirthday()!=null){
        String format1 = format.format(data.getBirthday());
            model.addAttribute("birthday",format1);
        }
        List<User> sales = userService.list(new QueryWrapper<User>().eq("deptid", 2));
        model.addAttribute("list",list);
        model.addAttribute("roleType",roleType);
        model.addAttribute("sales",sales);
        model.addAttribute("data",data);
        model.addAttribute("birthday",format1);
        model.addAttribute("city",city);

        model.addAttribute("type",type);
        model.addAttribute("isVip",data.getIsVip());
        if (data.getVipEndTime()!=null){
@@ -144,14 +151,14 @@
    @RequestMapping("/listAll")
    @ResponseBody
    public List<QueryAppUserVO> listAll(String province, String city,String name,
                                        String phone,Integer isVip, Integer salesmanUserName){
                                        String phone,Integer isVip, String salesmanUserName){
        QueryAppUser queryAppUser = new QueryAppUser();
        queryAppUser.setProvince(province);
        queryAppUser.setCity(city);
        queryAppUser.setName(name);
        queryAppUser.setPhone(phone);
        queryAppUser.setIsVip(isVip);
        queryAppUser.setSalesmanUserId(salesmanUserName);
//        queryAppUser.setSalesmanUser(salesmanUserName);
        if (province!=null && (!province.equals(""))){
            TCity p = cityService.getOne(new QueryWrapper<TCity>().eq("code", province));
            queryAppUser.setProvince(p.getName());