Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysMenuServiceImpl.java

@@ -38,7 +38,7 @@ public class SysMenuServiceImpl extends BaseServiceImpl<Integer, SysMenu>  imple
 		List<SysMenu> sysMenus;
 		List<SysMenu> sysMenusAllList;
 
-		if(sysUser.getTenantId() == -1){
+		if(sysUser.getTenantId() == -1 || sysUser.getIsSuperAdmin()){
 			sysMenus = sysMenuDao.findList(menuQueryInfo.getParentId(),menuQueryInfo.getDelFlag(),menuQueryInfo.getHid());
 			sysMenusAllList = sysMenuDao.findList(null,menuQueryInfo.getDelFlag(),menuQueryInfo.getHid());
 		}else {

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -171,6 +171,9 @@ public class ExportController extends BaseController {
     @PostMapping("export/managerDownload")
     @PreAuthorize("@pcs.hasPermissions('export/managerDownload')")
     public HttpResponseResult managerDownload(@RequestBody ExportDto exportDto){
+        if(exportDto.getHeadColumns() == null || exportDto.getHeadColumns().size() == 0){
+            throw new BizException("请选择导出字段");
+        }
         Map<String, Object> queryInfo = exportDto.getQueryInfo();
         if(queryInfo == null){
             queryInfo = new HashMap<>(10);