关系在街道党员增加是否在册党员条件筛选

src/ajax/api.ts

@@ -36,7 +36,7 @@ switch (process.env.NODE_ENV) {
   default:
     // 本地开发环境
     BASE_URL = '/api' // 由 vite.config 代理
-    TOKEN = 'ab100c91-298e-4b21-8f6d-13b6e9375914'
+    TOKEN = 'c0c4003b-9b3a-4daf-8363-5707ee891255'
     MAP_CONFIG = {
       jsApiUrl: 'http://10.108.3.41/arcgis_js_api/library/4.18/init.js',
       cssUrl: 'http://10.108.3.41/arcgis_js_api/library/4.18/esri/css/main.css',

src/store/actions.ts

@@ -175,20 +175,29 @@ async function getSum(query?: string) {
         q: query,
       })
     )?.find((e: any) => !e['是否虚拟组织'])?.__aggregate__ || 0
-  const member = await useFetchMember({
-    a: 'id,count',
-    keys: '是否居住在花木街道',
-    q: query,
-  })
-  const inHuamu =
-    member?.find((e: any) => e['是否居住在花木街道'])?.__aggregate__ || 0
-  const notInHuamu =
-    member?.find((e: any) => !e['是否居住在花木街道'])?.__aggregate__ || 0
 
+  const relationInStreet =
+    (
+      await useFetchMember({
+        a: 'id,count',
+        q: query
+          ? `${query},paths @ "是否在册党员" && boolean == true`
+          : 'paths @ "是否在册党员" && boolean == true',
+      })
+    )?.[0]?.__aggregate__ || 0
+  const liveInStreet =
+    (
+      await useFetchMember({
+        a: 'id,count',
+        q: query
+          ? `${query},paths @ "是否居住在花木街道" && boolean == true`
+          : 'paths @ "是否居住在花木街道" && boolean == true',
+      })
+    )?.[0]?.__aggregate__ || 0
   return [
     { name: '党组织', value: orgNum, unit: '个' },
-    { name: '关系在街道内党员', value: inHuamu + notInHuamu, unit: '位' },
-    { name: '街道居民党员', value: inHuamu, unit: '位' },
+    { name: '关系在街道内党员', value: relationInStreet, unit: '位' },
+    { name: '街道居民党员', value: liveInStreet, unit: '位' },
   ]
 }