diff --git a/cloud-property-common/src/main/java/com/muyu/common/domain/TableNames.java b/cloud-property-common/src/main/java/com/muyu/common/domain/TableNames.java index ac40e52..a1dca65 100644 --- a/cloud-property-common/src/main/java/com/muyu/common/domain/TableNames.java +++ b/cloud-property-common/src/main/java/com/muyu/common/domain/TableNames.java @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; import lombok.extern.log4j.Log4j2; import java.util.ArrayList; +import java.util.List; /** * @Author:yang @@ -47,7 +48,7 @@ public class TableNames { * 数据库表字段 */ @TableField(exist = false) - private ArrayList tableFie; + private List tableFie; public TableNames(String name, Integer dataId) { this.name = name; diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/impl/AssetAuthorizationServiceImpl.java b/cloud-property-server/src/main/java/com/muyu/server/service/impl/AssetAuthorizationServiceImpl.java index 1e61a0d..1dbf200 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/service/impl/AssetAuthorizationServiceImpl.java +++ b/cloud-property-server/src/main/java/com/muyu/server/service/impl/AssetAuthorizationServiceImpl.java @@ -35,13 +35,6 @@ public class AssetAuthorizationServiceImpl @Override public Long delUserAssetAccredit(AssetAuthorization req) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// if (null==req.getBasicId()){ -// queryWrapper.eq(AssetAuthorization::getUserId,req.getUserId()) -// .eq(AssetAuthorization::getTableId,req.getTableId()); -// }else if (null==req.getTableId()){ -// queryWrapper.eq(AssetAuthorization::getUserId,req.getUserId()) -// .eq(AssetAuthorization::getBasicId,req.getBasicId()); -// } if (null==req.getUserId()) { return 0L; } @@ -53,8 +46,6 @@ public class AssetAuthorizationServiceImpl public Long delDeptAssetAccredit(AssetAuthorization req) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); if (null==req.getDeptId()) { -// queryWrapper.eq(AssetAuthorization::getDeptId,req.getDeptId()) -// .eq(AssetAuthorization::getTableId,req.getTableId()); return 0L; } diff --git a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java index e54840e..3425bc2 100644 --- a/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java +++ b/cloud-property-server/src/main/java/com/muyu/server/service/impl/DataRunNameServiceImpl.java @@ -183,7 +183,8 @@ public class DataRunNameServiceImpl implements DataRunNameService { if (CollectionUtils.isEmpty(dataName.getTableNames())) {return null;} //在内部封装方法 dataName.getTableNames().forEach(tableName1 -> { - this.tableStructureShow(tableName1); + List tableFies = this.tableStructureShow(tableName1); + tableName1.setTableFie(tableFies); }); return tableNamesList; }