版本号

.gitignore

@@ -1,2 +1,2 @@
 node_modules
-.idea/
+.idea

.idea/CellsysBase.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/CellsysBase.iml" filepath="$PROJECT_DIR$/.idea/CellsysBase.iml" />
-    </modules>
-  </component>
-</project>

.idea/workspace.xml

@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="c4ea8ac7-164b-45ff-bbfd-c3f0f9ce655e" name="更改" comment="当前版本">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <excluded-from-favorite>
-      <branch-storage>
-        <map>
-          <entry type="LOCAL">
-            <value>
-              <list>
-                <branch-info repo="$PROJECT_DIR$" source="master" />
-              </list>
-            </value>
-          </entry>
-        </map>
-      </branch-storage>
-    </excluded-from-favorite>
-    <option name="PUSH_TAGS">
-      <GitPushTagMode>
-        <option name="argument" value="--tags" />
-        <option name="title" value="All" />
-      </GitPushTagMode>
-    </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectColorInfo">{
-  &quot;associatedIndex&quot;: 1
-}</component>
-  <component name="ProjectId" id="2qjkDDWcCp3kqhQnsWiZ1pEbaqB" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;last_opened_file_path&quot;: &quot;E:/work/web_CellsysPortal/trunk/cellsysArt&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.editor&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;D:\\Program Files\\WebStorm 2024.2.3\\plugins\\javascript-plugin\\jsLanguageServicesImpl\\external&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
-  }
-}</component>
-  <component name="SharedIndexes">
-    <attachedChunks>
-      <set>
-        <option value="bundled-js-predefined-d6986cc7102b-5c90d61e3bab-JavaScript-WS-242.23339.15" />
-      </set>
-    </attachedChunks>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="默认任务">
-      <changelist id="c4ea8ac7-164b-45ff-bbfd-c3f0f9ce655e" name="更改" comment="" />
-      <created>1735183249700</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1735183249700</updated>
-      <workItem from="1735183250727" duration="851000" />
-      <workItem from="1735194108286" duration="9000" />
-      <workItem from="1735195064295" duration="17798000" />
-      <workItem from="1735957384445" duration="2821000" />
-      <workItem from="1736748405465" duration="822000" />
-    </task>
-    <task id="LOCAL-00001" summary="一些调整">
-      <option name="closed" value="true" />
-      <created>1735183268189</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1735183268189</updated>
-    </task>
-    <task id="LOCAL-00002" summary="axios的封装调整">
-      <option name="closed" value="true" />
-      <created>1735201083555</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1735201083555</updated>
-    </task>
-    <task id="LOCAL-00003" summary="1.15.6">
-      <option name="closed" value="true" />
-      <created>1735202096134</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1735202096134</updated>
-    </task>
-    <task id="LOCAL-00004" summary="token的获取方式改变">
-      <option name="closed" value="true" />
-      <created>1735263702918</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1735263702918</updated>
-    </task>
-    <task id="LOCAL-00005" summary="当前版本">
-      <option name="closed" value="true" />
-      <created>1736748676545</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1736748676545</updated>
-    </task>
-    <option name="localTasksCounter" value="6" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="master" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="一些调整" />
-    <MESSAGE value="axios的封装调整" />
-    <MESSAGE value="1.15.6" />
-    <MESSAGE value="token的获取方式改变" />
-    <MESSAGE value="当前版本" />
-    <option name="LAST_COMMIT_MESSAGE" value="当前版本" />
-  </component>
-</project>

cellsysGroup.js

@@ -147,7 +147,7 @@ class CellsysGroup {
                 _membersParam.push({
                     _realname: memberObj.realName,
                     _mobile: memberObj.mobile,
-                    _gender: memberObj.gender,
+                    _gender: String(memberObj.gender),
                     _email: memberObj.email,
                     _member_type_name: memberObj.typeName
                         ? memberObj.typeName
@@ -210,5 +210,4 @@ class CellsysGroup {
     }
 }
 
-
+export default CellsysGroup;
-export default CellsysGroup

cellsysOrg.js

@@ -241,7 +241,7 @@ class CellsysOrg {
         editTask.addParam('_username', params.userName);
         editTask.addParam('_realname', params.realName);
         editTask.addParam('_email', params.email);
-        editTask.addParam('_gender', params.gender);
+        editTask.addParam('_gender', String(params.gender));
         editTask.addParam('_birthday', params.birthday);
         editTask.addParam('_avatar', params.avatar);
         editTask.addParam('_is_username', 0);
@@ -296,9 +296,9 @@ class CellsysOrg {
     /**
      * 查询组织内的所有App
      */
-    queryApps(pageInfo, order, filters) {
+    queryApps(pageInfo, order, filters,getUnion) {
         let query = new Query();
-        query.addFilter('org_id', Operator.Equals, this.id);
+        // query.addFilter('org_id', Operator.Equals, this.id);
         if (pageInfo) {
             query.setCurrPage(pageInfo.currPage);
             query.setPageSize(pageInfo.pageSize);
@@ -313,7 +313,14 @@ class CellsysOrg {
                 query.addFilter(item['name'], item['operator'], item['value']);
             });
         }
-        let queryTask = new QueryTask(QueryType.App, pageInfo ? true : false);
+        let queryType=QueryType.App
+        if (this.unionStatus === 1 && getUnion === true) {
+            //联合状态为父级组织，并且需要获取联合信息
+            queryType = QueryType.UnionApp;
+        } else {
+            query.setOrder({ org_id: 'asc', id: 'desc' });
+        }
+        let queryTask = new QueryTask(queryType, pageInfo ? true : false);
         return new Promise((resolve, reject) => {
             queryTask
                 .execute(query)
@@ -346,9 +353,9 @@ class CellsysOrg {
      * @param order
      * @returns {Promise<unknown>}
      */
-    queryAppListByPublish(pageInfo, filters, order) {
+    queryAppListByPublish(pageInfo, filters, order,getUnion) {
         let query = new Query();
-        query.addFilter('org_id', Operator.Equals, this.id);
+        // query.addFilter('org_id', Operator.Equals, this.id);
         query.addFilter('is_publish', Operator.Equals, 1);
         if (pageInfo) {
             query.setCurrPage(pageInfo.currPage);
@@ -364,7 +371,14 @@ class CellsysOrg {
                 query.addFilter(item['name'], item['operator'], item['value']);
             });
         }
-        let queryTask = new QueryTask(QueryType.App, pageInfo ? true : false);
+        let queryType=QueryType.App
+        if (this.unionStatus === 1 && getUnion === true) {
+            //联合状态为父级组织，并且需要获取联合信息
+            queryType = QueryType.UnionApp;
+        } else {
+            query.setOrder({ org_id: 'asc', id: 'desc' });
+        }
+        let queryTask = new QueryTask(queryType, pageInfo ? true : false);
         return new Promise((resolve, reject) => {
             queryTask
                 .execute(query)

cellsysUtil.js

@@ -54,6 +54,8 @@ const QueryType = {
     UnionMemberTypeUser: '/rpc/view_org_union_member_type_user',
     // 门户中App的列表
     App: '/rpc/view_org_app_basic', //查询应用基础列表2（含原始应用id）view_app_basic不含
+    //查询组织联合的u应用列表
+    UnionApp: '/rpc/view_org_union_app',
     // 应用模板
     AppModel: '/rpc/view_app_model',
     AppModelType: '/rpc/view_app_model_type',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@airkoon/cellsys",
-  "version": "1.16.3",
+  "version": "1.16.4",
   "description": "边缘服务器和cloud的公共库",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"