Преглед на файлове

bug:非法前置引用

4.0
FLYPHT преди 2 години
родител
ревизия
ebb8c874a1
променени са 2 файла, в които са добавени 11 реда и са изтрити 11 реда
  1. +2
    -0
      smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/common/BpmEnum.java
  2. +9
    -11
      smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java

+ 2
- 0
smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/common/BpmEnum.java Целия файл

@@ -29,6 +29,8 @@ public interface BpmEnum {
public static MenuFuncRight instance = new MenuFuncRight();
public static StrEnumBean READ = instance.addEnum("read", "查看");
public static StrEnumBean WRITE = instance.addEnum("write", "修改");
public static StrEnumBean EXPORT = instance.addEnum("export", "导出");
public static StrEnumBean AUDIT = instance.addEnum("audit", "审核");
}

class UserStatu extends IntEnum {


+ 9
- 11
smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageHelper.java Целия файл

@@ -144,7 +144,8 @@ public class DynPageHelper {
buildSelectSql(dataSet, params, sqlNamedPara, null);
return sqlNamedPara;
}

private static Map<String, IBuilderExpr> mapBuilder;
private static IBuilderExpr baseBuilder;
static {
baseBuilder = (opt, field, name, value, args, filter) -> {
args.put(name, value);
@@ -180,13 +181,13 @@ public class DynPageHelper {
args.put(name, value);
return field + " not in (:" + name + ") ";
});
mapBuilder.put(SwEnum.OptType.IN_CHILD.value, (opt, field, name, value, args, filter) -> {
ModelTable table = ModelTableCache.getInstance().get(filter.link);
if(table==null){
return "";
}
return TreeHelper.getTreeHelper(table.getName()).buildLikeFrSql(Long.parseLong(value.toString()),field);
});
// mapBuilder.put(SwEnum.OptType.IN_CHILD.value, (opt, field, name, value, args, filter) -> {
// ModelTable table = ModelTableCache.getInstance().get(filter.link);
// if(table==null){
// return "";
// }
// return TreeHelper.getTreeHelper(table.getName()).buildLikeFrSql(Long.parseLong(value.toString()),field);
// });
}

private static String buildSelFieldsSql(PageDataset dataSet, SqlNamedPara sqlNamedPara, IBuildSqlListener listener) {
@@ -363,9 +364,6 @@ public class DynPageHelper {
}
}

private static Map<String, IBuilderExpr> mapBuilder;
private static IBuilderExpr baseBuilder;

/**
* 构建数据权限
* @param dsType 数据权限定义ID


Зареждане…
Отказ
Запис