10.26

nickchange

2023-10-26 565547a1d026a9bcff26f3e0edaf079bdb7a55d4

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

@@ -133,6 +133,9 @@
            SimpleDateFormat format2 = new SimpleDateFormat("yyyy-MM-dd");
            String format3 = format2.format(data.getVipEndTime());
            model.addAttribute("vipEndTime",format3);
        }else {
            model.addAttribute("vipEndTime","");

        }
        if (data.getViplevelId()!=null){
            // todo创建会员等级表
@@ -173,7 +176,10 @@
        List<QueryAppUserVO> queryAppUserVOS = appUserClient.listAll(queryAppUser);
        for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
            if (queryAppUserVO.getSalesmanUserId()!=null){
                queryAppUserVO.setSalesmanUserName(userService.getById(queryAppUserVO.getSalesmanUserId()).getName());
                User byId = userService.getById(queryAppUserVO.getSalesmanUserId());
                if (byId!=null){
                    queryAppUserVO.setSalesmanUserName(byId.getName());
                }
            }
        }
        if (salesmanUserName!=null && (!salesmanUserName.equals(""))){