Merge branch 'dev' into 'test'

update：增加门户管理允许匿名访问

See merge request jygk/dsc!7

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/dal/mysql/portal/PortalMapper.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.system.dal.mysql.portal;
 
+import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -35,7 +36,11 @@ public interface PortalMapper extends BaseMapperX<PortalDO> {
      */
     default List<PortalDO> selectListByPermissions(List<String> permissions) {
         return selectList(new LambdaQueryWrapperX<PortalDO>()
-                .in(PortalDO::getPermission, permissions)
+                .and(qw -> qw
+                        .in(CollectionUtils.isNotEmpty(permissions), PortalDO::getPermission, permissions)
+                        .or().isNull(PortalDO::getPermission)
+                        .or().eq(PortalDO::getPermission, "")
+                )
                 .eq(PortalDO::getStatus, 0) // 只查询启用的门户
                 .orderByAsc(PortalDO::getSort)
                 .orderByDesc(PortalDO::getId));