Merge branch 'main' of http://10.10.14.176:3000/huanghai/QingLong

src/main/java/com/dsideal/QingLong/DataShare/Controller/DataShareController.java

@@ -294,16 +294,15 @@ public class DataShareController extends Controller {
     @IsLoginInterface({})
     @IsSysAdminInterface({"1"})
     @IsNumericInterface({"system_id"})
-    @EmptyInterface({"table_names"})
     public void share(int system_id, String table_names) {
-        if (!dm.isExistTable(table_names)) {
+        if (!StrKit.isBlank(table_names) && !dm.isExistTable(table_names)) {
             Kv kv = Kv.by("success", false);
             kv.set("message", "检查到数据表在数据库中不存在的情况，请检查后重新录入！");
             renderJson(kv);
             return;
         }
         //检查一下共享的表是不是已经被其它系统共享过？
-        if (!dm.checkShareTable(system_id,table_names)) {
+        if (!StrKit.isBlank(table_names) && !dm.checkShareTable(system_id, table_names)) {
             Kv kv = Kv.by("success", false);
             kv.set("message", "检查到要共享的数据表已经被其它业务系统共享，请检查后重新录入！");
             renderJson(kv);

src/main/java/com/dsideal/QingLong/DataShare/Model/DataShareModel.java

@@ -195,10 +195,13 @@ public class DataShareModel {
         }
 
         //2、重新分配新共享表的写权限
-        for (String s : table_names.split(",")) {
-            PgUtil.grantUserPrivilege(user_name, s, PgUtil.WRITE);
+        if (!StrKit.isBlank(table_names)) {
+            for (String s : table_names.split(",")) {
+                PgUtil.grantUserPrivilege(user_name, s, PgUtil.WRITE);
+            }
         }
 
+
         //3、原来订阅这个系统有第三方系统有哪些，它们的用户都需要取消对原来表的读授权
         List<String> listUser = new ArrayList<>();
         List<Integer> lSystem = getSubSystemList(system_id);
@@ -226,11 +229,13 @@ public class DataShareModel {
         Db.update(sql, system_id);
 
         //6、保存新数据
-        for (String s : table_names.split(",")) {
-            systemRecord = new Record();
-            systemRecord.set("system_id", system_id);
-            systemRecord.set("table_name", s);
-            Db.save("t_datashare_table", "id", systemRecord);
+        if (!StrKit.isBlank(table_names)) {
+            for (String s : table_names.split(",")) {
+                systemRecord = new Record();
+                systemRecord.set("system_id", system_id);
+                systemRecord.set("table_name", s);
+                Db.save("t_datashare_table", "id", systemRecord);
+            }
         }
     }