diff --git a/WebRoot/upload/D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.pdf b/WebRoot/upload/D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.pdf index 007b1fb4..1086fb26 100644 Binary files a/WebRoot/upload/D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.pdf and b/WebRoot/upload/D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.pdf differ diff --git a/src/main/java/com/dsideal/QingLong/DataShare/Model/DataShareModel.java b/src/main/java/com/dsideal/QingLong/DataShare/Model/DataShareModel.java index a30f2a31..ef77cc60 100644 --- a/src/main/java/com/dsideal/QingLong/DataShare/Model/DataShareModel.java +++ b/src/main/java/com/dsideal/QingLong/DataShare/Model/DataShareModel.java @@ -19,7 +19,15 @@ public class DataShareModel { kv.set("exclude", exclude); } SqlPara sp = Db.getSqlPara("DataShare.listSystem", kv); - return Db.paginate(page, limit, sp); + Page list = Db.paginate(page, limit, sp); + for (Record record : list.getList()) { + String subscribe_system_ids = record.getStr("subscribe_system_ids"); + if (StrKit.isBlank(subscribe_system_ids)) record.set("subscribe_system_count", 0); + else { + record.set("subscribe_system_count", subscribe_system_ids.split(",").length); + } + } + return list; } /** diff --git a/src/main/resource/Sql/DataShare.sql b/src/main/resource/Sql/DataShare.sql index 0372640c..de1d0ff8 100644 --- a/src/main/resource/Sql/DataShare.sql +++ b/src/main/resource/Sql/DataShare.sql @@ -1,8 +1,7 @@ #namespace("DataShare") #sql("listSystem") select t1.*, - (select count(1) from t_datashare_table as t2 where t2.system_id=t1.system_id) as share_table_count, - array_length(string_to_array(t1.url, ','), 1) as subscribe_system_count + (select count(1) from t_datashare_table as t2 where t2.system_id=t1.system_id) as share_table_count from t_datashare_system as t1 where t1.system_name like #para(keyword, "like") #if(exclude)