From 083bed1be51dc21792a245b035b50dfef0a24db3 Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期二, 17 十月 2023 19:07:18 +0800 Subject: [PATCH] update --- cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java index 19de033..1afed17 100644 --- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java +++ b/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){ -- Gitblit v1.7.1