|
@@ -58,7 +58,7 @@ public class FuncidDefChangeRecordService {
|
|
|
list.addAll(CriteriaUtils.parse(qt.publishUser, object.get("publishUser")));
|
|
|
list.addAll(CriteriaUtils.parse(qt.publishTime, object.get("publishTime")));
|
|
|
list.addAll(CriteriaUtils.parse(qt.finishTime, object.get("finishTime")));
|
|
|
- list.addAll(CriteriaUtils.parse(qt.state, object.get("state"), EnumVersionState.class));
|
|
|
+ list.addAll(CriteriaUtils.parse(qt.state, object.get("state")));
|
|
|
list.addAll(CriteriaUtils.parse(qt.version, object.get("version")));
|
|
|
return list;
|
|
|
}
|
|
@@ -127,7 +127,7 @@ public class FuncidDefChangeRecordService {
|
|
|
param.setWeakPoint(funcidDef.getWeakPoint());
|
|
|
}
|
|
|
QFuncidDefChangeRecord qt = QFuncidDefChangeRecord.funcidDefChangeRecord;
|
|
|
- BooleanExpression ex = qt.code.eq(code).and(qt.state.eq(EnumVersionState.INIT)).and(qt.version.isNull());
|
|
|
+ BooleanExpression ex = qt.code.eq(code).and(qt.state.eq(EnumVersionState.INIT.getValue())).and(qt.version.isNull());
|
|
|
Iterable<FuncidDefChangeRecord> all = repository.findAll(ex);
|
|
|
List<FuncidDefChangeRecord> list = new ArrayList<>();
|
|
|
all.forEach(list::add);
|