From 042db644d974fd5fd8506a6d3998eaa67433c700 Mon Sep 17 00:00:00 2001
From: yangrd <1020519285@qq.com>
Date: Mon, 31 Mar 2025 10:20:37 +0800
Subject: [PATCH] =?UTF-8?q?1,=E5=A2=9E=E5=8A=A0LIA=E8=81=94=E5=90=88?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E5=A4=8D=E6=A1=A3=E6=A1=88=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=202=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=A1=A3=E6=A1=88?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=81=97=E6=BC=8F=E7=9A=84=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=8F=8A=E7=BB=84=E7=BB=87=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=203=EF=BC=8C=E5=88=A0=E9=99=A4ArtSystem=E7=9A=84orgId=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0unionStatus=EF=BC=8C=E5=B9=B6=E5=9C=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E5=A4=8D=E6=A1=A3=E6=A1=88=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=81=94=E5=90=88=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=204=EF=BC=8C@airkoon/cellsys=E7=9A=84=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 artApi.js        |  1 +
 artRepairFile.js |  6 ++++--
 artSystem.js     | 16 +++++++++++++---
 package.json     |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/artApi.js b/artApi.js
index 0a03ed6..36f5c52 100644
--- a/artApi.js
+++ b/artApi.js
@@ -31,6 +31,7 @@ const artApi = {
     conditionCheckUpdate: '/rpc/conditionCheckUpdate', //修改状况检查
     conditionCheckDelete: '/rpc/conditionCheckDelete', //删除状况检查
     viewConditionCheck: '/rpc/viewConditionCheck', //查询状况检查
+    viewOrgUnionRepairRecord:'/rpc/viewOrgUnionRepairRecord',//查询联合档案列表
     viewRepairRecord: '/rpc/viewRepairRecord', //查询修复档案列表
     repairRecordInsert: '/rpc/repairRecordInsert', //创建修复档案
     repairRecordUpdate: '/rpc/repairRecordUpdate', //编辑修复档案
diff --git a/artRepairFile.js b/artRepairFile.js
index bad1466..6d2fdd7 100644
--- a/artRepairFile.js
+++ b/artRepairFile.js
@@ -39,20 +39,22 @@ class ArtRepairFile {
                 return { name: name };
             });
         }
+        this.orgName = params.org_name;
         //发布状态有关逻辑
         this.isPublish = params.is_publish;
         this.isUnlock = params.is_unlock;
-        this.publishRange = params.publish_range;
+        this.publishRange=params.publish_range
         this.publishGroup = params.publish_group ? params.publish_group : []; //发布的群组
     }
 
     //艺术品封面图
     get coverImageUrl() {
-        if (this.artworkRecord['artworkImages'] && this.artworkRecord['artworkImages'].length > 0) {
+        if (this.artworkRecord && this.artworkRecord['artworkImages'].length > 0) {
             return this.artworkRecord['artworkImages'][0].compressionUrl;
         }
     }
 
+    //艺术品封面图
     get oldNameFormat() {
         return `《${this.artworkRecord['oldName']}》`;
     }
diff --git a/artSystem.js b/artSystem.js
index a1be5a2..e2fb787 100644
--- a/artSystem.js
+++ b/artSystem.js
@@ -20,7 +20,10 @@ import ArtworkEquipmentType from './equipmentType';
 import EquipmentData from './equipmentData';
 
 class ArtSystem {
-    constructor(orgId) {}
+    constructor(orgId) {
+
+    }
+    static unionStatus=null
     static token = null;
 
     //查询艺术品材质字典
@@ -351,13 +354,20 @@ class ArtSystem {
     //查询系统修复档案列表
     static queryRepairFiles(params) {
         let query = new Query();
-        let { filter, pageInfo } = params;
+        let { filter, pageInfo,getUnion } = params;
         if (filter) {
             filter.forEach((item) => {
                 query.addFilter(item['name'], item['operator'], item['value']);
             });
         }
-        let queryTask = new QueryTask(artApi.viewRepairRecord, !!pageInfo);
+        let queryType=artApi.viewRepairRecord
+        if ( ArtSystem.unionStatus&&getUnion === true) {
+            //联合状态为父级组织，并且需要获取联合信息
+            queryType = artApi.viewOrgUnionRepairRecord;
+        } else {
+            query.setOrder({ org_id: 'asc', id: 'desc' });
+        }
+        let queryTask = new QueryTask(queryType, !!pageInfo);
         return new Promise((resolve, reject) => {
             queryTask
                 .execute(query)
diff --git a/package.json b/package.json
index 095ac27..c4684cc 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "license": "ISC",
     "description": "美院相关",
     "dependencies": {
-        "@airkoon/cellsys": "git+http://zhangqg:12345678@airkoon.cn:8418/airkoon/cellsysBase.git#V1.16.4",
+        "@airkoon/cellsys": "git+http://airkoon.cn:8418/airkoon/cellsysBase.git#V1.16.4",
         "axios": "^1.4.0",
         "dayjs": "~1.10.6",
         "element-plus": "^2.3.7",