diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/datalog/LogJoinInfo.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/datalog/LogJoinInfo.java index a64baaf..30837c9 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/datalog/LogJoinInfo.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/datalog/LogJoinInfo.java @@ -18,7 +18,7 @@ public class LogJoinInfo { private LogJoin join; - public static LogJoinInfo ofAnnotation(Class klazz,Field field) { + public static LogJoinInfo ofAnnotation(Field field) { return new LogJoinInfo().setJoin(SpringAnnotationUtils.findAnnotation(field, LogJoin.class)).setField(field); } diff --git a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/datalog/LogTableInfo.java b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/datalog/LogTableInfo.java index 68bf3cb..cec40da 100644 --- a/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/datalog/LogTableInfo.java +++ b/itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/pictc/datalog/LogTableInfo.java @@ -93,8 +93,8 @@ public class LogTableInfo { List _fields = BeanUtils.getFields(klazz, LogJoin.class); if(CollectionUtils.isNotEmpty(_fields)) { for (Field field : _fields) { - fields.add(LogFieldInfo.ofField(field)); - joins.add(LogJoinInfo.ofAnnotation(klazz, field)); + //fields.add(LogFieldInfo.ofField(field)); + joins.add(LogJoinInfo.ofAnnotation(field)); } } } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngGradeSystemDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngGradeSystemDto.java index dbfb002..6cb2b57 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngGradeSystemDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngGradeSystemDto.java @@ -84,7 +84,7 @@ public class UpdateLngGradeSystemDto implements Serializable { @ApiModelProperty("lngGradeSystemItem子表") @LogJoin(name = "lngGradeSystemItem子表", columns = { - @LogJoinColumn(field = "gsId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "gsId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngGradeSystemItemDto.class, type = JoinType.MANY) private List lngGradeSystemItemList;