2369059705@qq.com
2023-06-12 b18c5b8db781dd2c057ede09d07f4f88d0eaef0b
src/main/java/com/product/server/report/service/ReportConfigService.java
@@ -51,12 +51,18 @@
      List<Object> paramList = Lists.newArrayList();
      StringBuilder sql = new StringBuilder(512);
      String queryFilter = " ";
      if(!BaseUtil.dataTableIsEmpty(fse.getSubDataTable("systemSeniorQueryString"))){
         queryFilter ="AND"+ queryFilterService.getQueryFilter(fse);
      }
      sql.append("\nSELECT a.uuid,a.type_uuid,a.is_valid,a.org_level_uuid,a.report_name,b.type_name,b.type_group")
            .append("\nFROM product_sys_report_config a")
            .append("\nLEFT JOIN product_sys_report_type_config b ON a.type_uuid = b.uuid")
            .append("\nwhere (function_uuid is null or function_uuid='') ");
            .append("\nwhere (function_uuid is null or function_uuid='') ")
              .append(queryFilter);
      if (!StringUtils.isEmpty(fse.getString(CmnConst.TYPE_UUID))) {
         sql.append("\nand b.type_group=?");
         sql.append("\nand b.type_group=? ");
         paramList.add(fse.getString(CmnConst.TYPE_UUID));
      }
      return baseDao.listTable(sql.toString(), paramList.toArray(), pageSize, cpage);
@@ -317,7 +323,7 @@
      fseFunction.setValue(CmnConst.FUNCTION_NAME, fseReport.getString(CmnConst.REPORT_NAME));    //功能名称
      fseFunction.setValue(CmnConst.FUNCTION_DESCRIPTION, fseReport.getString(CmnConst.REPORT_NAME));    //功能描述
      fseFunction.setValue(CmnConst.STATUS_UUID, 1);            //是否启用
      fseFunction.setValue(CmnConst.FUNCTION_TYPE_UUID, 1);    //功能类型-业务功能
      fseFunction.setValue(CmnConst.FUNCTION_TYPE_UUID, 5);    //功能类型-业务后台管理 管理员和普通用户都能分配该报表的权限
      fseFunction.setValue(CmnConst.CLIENT_TYPE_UUID, "Web");        //客户端类型
      fseFunction.setValue(CmnConst.VERSION_UUID, "001");
      fseFunction.setValue(CmnConst.DATA_TYPE, 1);// 数据类型
@@ -384,11 +390,11 @@
      // 提取发布的角色相关数据
      List<String> roleUUIDList = Lists.newArrayList();
      List<String> clientUUIDList = Lists.newArrayList();
      String[] singleRoleInfoArr;
      clientUUIDList.add(SpringMVCContextHolder.getCurrentUser().getClientUuid());
//      String[] singleRoleInfoArr;
      for (String singleRoleInfo : fse.getString(CmnConst.ROLE_UUID).split("#")) {
         singleRoleInfoArr = singleRoleInfo.split(",");
         roleUUIDList.add(singleRoleInfoArr[2]);
         clientUUIDList.add(singleRoleInfoArr[0]);
//         singleRoleInfoArr = singleRoleInfo.split(",");
         roleUUIDList.add(singleRoleInfo);
      }
      // 2.绑定角色(给某一角色赋予该功能)