Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-08 07fc18f77a9764bd47857e30d65abc03cc1e439c

 src/main/java/com/zy/common/web/AuthController.java

@@ -140,9 +140,9 @@
            resourceWrapper = new EntityWrapper<Resource>().eq("level", 2).eq("status", 1).orderBy("sort");
        } else {
            // 激活码验证
            if (!SystemProperties.SYSTEM_ACTIVATION) {
                return R.ok();
            }
//            if (!SystemProperties.SYSTEM_ACTIVATION) {
//                return R.ok();
//            }
            oneLevel = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
            // 获取当前用户的所有二级菜单
            user = userService.selectById(getUserId());