fix: 驿站查询时排除已禁用的驿站人员

src/main/resources/mapping/cquery/SiteInfoCQuery.xml

@@ -4,8 +4,7 @@
     <select id="getList" resultType="com.hz.employmentsite.vo.baseSettings.SiteInfoVo">
         select site.*,inSites.InstitutionID as InstitutionID,inSites.SiteInstitutionID,institution.companyName as
         InstitutionName,
-        (select GROUP_CONCAT(SiteUserName SEPARATOR ',') from pc_site_user siteUser where SiteID = site.siteID ) AS
-        siteUsers,
+        siteUserStr.siteUsers,
         ModifyUser.Name as modifyUserName,
         region.name as RegionName,street.name as StreetName from pc_site site
         left join pc_site_institution inSites on site.SiteID = inSites.SiteID
@@ -13,6 +12,19 @@
         left join area_code region on site.RegionCode = region.code
         left join area_code street on site.StreetCode = street.code
         left join sys_user ModifyUser on site.ModifyUserID = ModifyUser.UserID
+        LEFT JOIN (
+            SELECT
+                siteTemp.siteID,
+                GROUP_CONCAT( SiteUserName SEPARATOR ',' ) AS siteUsers
+            FROM
+                pc_site_user siteUser
+            LEFT JOIN sys_user sysUser ON siteUser.UserID = sysUser.UserID
+            LEFT JOIN pc_site siteTemp ON siteTemp.SiteID = siteUser.SiteID
+            WHERE
+                sysUser.RecordStatus = 1
+            GROUP BY
+                siteTemp.SiteID
+        ) siteUserStr ON siteUserStr.SiteID = site.SiteID
         where 1=1
         <if test="siteIDList!='' and siteIDList!=null">
             and site.siteID in (${siteIDList})

vue/src/views/dataMap/siteDataMap.vue

@@ -74,7 +74,7 @@
                  :key="siteIndex"
                  @click="checkSite(site)"
                  @mouseenter="siteMouseenter(site)"
-                 @mouseleave="siteMouseenter({siteID:-1})"
+                 @mouseleave="siteMouseenter({siteID:null})"
             >
               <p class="site-name">
                 {{ site.siteName }}
@@ -93,7 +93,7 @@
                  :key="siteIndex"
                  @click="checkSiteUser(siteUser)"
                  @mouseenter="siteUserMouseenter(siteUser)"
-                 @mouseleave="siteUserMouseenter({siteUserID:-1})"
+                 @mouseleave="siteUserMouseenter({siteUserID:null})"
             >
               <p class="site-name">
                 {{ siteUser.siteUserName }}
@@ -124,7 +124,7 @@
         </div>
       </div>
       <!-- 驿站详情 -->
-      <div class="site-info-box" v-if="searchType == 'site' && nowCheckSite.siteID != -1">
+      <div class="site-info-box" v-if="searchType == 'site' && nowCheckSite.siteID != null">
         <p class="font-size-16 font-weight-600 margin-bottom-10">{{ nowCheckSite.siteName }}</p>
         <p class="margin-bottom-3">驿站编号：{{ nowCheckSite.siteCode }}</p>
         <p class="margin-bottom-3">地点：{{ nowCheckSite.detailAddress }}</p>
@@ -136,7 +136,7 @@
         <p class="margin-bottom-3">站点工作人员：{{ nowCheckSite.siteUsers.length }}人</p>
       </div>
       <!-- 驿站人员信息详情 -->
-      <div class="site-user-info-box" v-if="searchType == 'siteUser' && nowCheckSiteUser.siteUserID != -1">
+      <div class="site-user-info-box" v-if="searchType == 'siteUser' && nowCheckSiteUser.siteUserID != null">
         <div class="user-info-box margin-bottom-10">
           <p class="font-size-18 margin-bottom-8" style="font-weight: 600">
             {{ nowCheckSiteUser.siteUserName }}
@@ -215,15 +215,15 @@ const streetList = ref<SelectProps['options']>();
 // 驿站下拉框数据
 const siteDicList = ref<any>([]);
 // 选中的站点
-const nowCheckSite = ref<any>({siteID: -1})
+const nowCheckSite = ref<any>({siteID: null})
 // 鼠标经过的站点
-const nowMouseenterSite = ref<any>({siteID: -1});
+const nowMouseenterSite = ref<any>({siteID: null});
 // 驿站的业务数据
 const siteDataCount = ref<any>({})
 // 选中的站点
-const nowCheckSiteUser = ref<any>({siteUserID: -1})
+const nowCheckSiteUser = ref<any>({siteUserID: null})
 // 鼠标经过的站点
-const nowMouseenterSiteUser = ref<any>({siteUserID: -1});
+const nowMouseenterSiteUser = ref<any>({siteUserID: null});
 // 驿站人员的业务数据
 const siteUserDataCount = ref<any>({})