Merge remote-tracking branch 'origin/master'

YYC

2023-10-27 08000305684ec0c758090fbb5cbd85132218fcef

 igds-web/src/main/java/com/ld/igds/web/WebController.java

@@ -97,7 +97,7 @@

        // 技术支持信息
        view.addObject("support", "技术支持：" + sysConf.getSupport());
        if (StringUtils.isEmpty(groupTag)){
        if (StringUtils.isEmpty(groupTag)) {
            groupTag = "0";
        }
        view.addObject("groupTag", groupTag);
@@ -113,6 +113,9 @@
        }
        if ("5326".equals(companyId)) {
            view.setViewName("index/index-5326");
        }
        if ("5329".equals(companyId)) {
            view.setViewName("index/index-5329");
        }
        return view;
    }
@@ -193,7 +196,7 @@
            welcomeUrl += "all";
        } else {
            welcomeUrl += code;
            menuList = systemService.getMenuBySystemId(company.getId(), code,user);
            menuList = systemService.getMenuBySystemId(company.getId(), code, user);
        }

        view.addObject("menuList", menuList);