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 4c9747c..7123be6 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 @@ -23,6 +23,8 @@ import org.springframework.util.CollectionUtils; import java.sql.*; import java.util.*; +import static io.jsonwebtoken.security.Jwks.set; + /** * @Author:yang * @Package:com.muyu.server.service.impl @@ -142,15 +144,18 @@ public class DataRunNameServiceImpl implements DataRunNameService { //在取数据数据遍历里获取表名称查询方法 tableIdAndBasicIdByUserId.forEach(tableIdAndBasicId -> { List tableNames = this.dataDeptShow(tableIdAndBasicId, dataName); - set.addAll(tableNames); + assert tableNames != null; + set.addAll(tableNames); }); idByDeptId.forEach(tableIdAndBasicId -> { List tableNames = this.dataDeptShow(tableIdAndBasicId, dataName); - set.addAll(tableNames); + assert tableNames != null; + set.addAll(tableNames); }); } - dataName.setTableNames((List) set); + List tableNameSet = (List) set(); + dataName.setTableNames(tableNameSet); }); //返回所有数据 return dataNameList;