From b2760ada4283f87733ebb2eadf770b4c4f73a594 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 24 Jul 2024 09:14:41 +0800
Subject: [PATCH] 'commit'

---
 .../D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.pdf  | Bin 96532 -> 96532 bytes
 .../DataShare/Model/DataShareModel.java       |  10 +++++++++-
 src/main/resource/Sql/DataShare.sql           |   3 +--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/WebRoot/upload/D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.pdf b/WebRoot/upload/D9397D0C-3A4D-47F9-9A35-6B2E64DF3991.pdf
index 007b1fb4092d4d89f1a40e0d64f6618cb6470cf0..1086fb26703f5f409954fa9663b31540e4cc7bc8 100644
GIT binary patch
delta 102
zcmbR8iFL{+)(w6!%!UT0lLKR<Ky-6n%=Ww(MpqdpQ&)30Hxpw6Cl^z5Gh;JTGiNhr
zb7NymLvu4%C!naEjj4gNg_F5~tAV41rJJjXrIWLPlbf-#i>ZZ+siBdZ^YpJ3jPd~L
C_Zzza

delta 102
zcmbR8iFL{+)(w6!%m$W*lLKR<Ky-6n%=Ww(MpqdpGgoJ0CvyV}7bi0_Gh;JTGiNhr
zb7M0zClf<gOEXhvI~yZcBU2|wb5|!fGgD(n6C(>}7jqXEQ&VSiXLA#0OV{aND;VVg
D?N%GZ

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<Record> 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)