Merge remote-tracking branch 'origin/master'

YYC

2023-09-07 7243e0b4bd9a267a633d2e481e17646509b6868d

 igds-n2/src/main/java/com/ld/igds/n2/controller/N2Controller.java

@@ -80,7 +80,7 @@
        if (DepotType.TYPE_02.getCode().equals(depotType) || DepotType.TYPE_04.getCode().equals(depotType)) {
            view.setViewName("admin/n2/n2-hand2");
        } else {
            if ("5013".equals(user.getCompanyId()) || "5016".equals(user.getCompanyId())) {
            if ("5013".equals(user.getCompanyId()) || "5016".equals(user.getCompanyId()) || "5325".equals(user.getCompanyId())) {
                view.setViewName("admin/n2/n2-hand-5013");
            } else {
                view.setViewName("admin/n2/n2-hand1");
@@ -128,7 +128,7 @@
        view.addObject("n2ImgMap", n2ImgMap);

        view.setViewName("admin/n2/n2-hand1");
        if ("5013".equals(user.getCompanyId()) || "5016".equals(user.getCompanyId())) {
        if ("5013".equals(user.getCompanyId()) || "5016".equals(user.getCompanyId()) || "5325".equals(user.getCompanyId())) {
            view.setViewName("admin/n2/n2-hand-5013");
        }
        return view;