From 80277fecd6763006d082bcfd3dae3cdac580aea8 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Mon, 11 May 2026 08:17:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/domain/SysUserDataScope.java         |  6 ++++
 .../data/mapper/SysUserDataScopeMapper.java   |  9 ++++++
 .../service/impl/FishImportServiceImpl.java   |  2 +-
 .../mapper/data/SysUserDataScopeMapper.xml    | 31 +++++++++++++++++++
 4 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/yfd/platform/data/domain/SysUserDataScope.java b/backend/src/main/java/com/yfd/platform/data/domain/SysUserDataScope.java
index b3513dd..beca8a9 100644
--- a/backend/src/main/java/com/yfd/platform/data/domain/SysUserDataScope.java
+++ b/backend/src/main/java/com/yfd/platform/data/domain/SysUserDataScope.java
@@ -49,6 +49,12 @@ public class SysUserDataScope implements Serializable {
      */
     private String orgId;
 
+    /**
+     * 资源名称（根据orgType关联查询得出）
+     */
+    @TableField(exist = false)
+    private String orgName;
+
     /**
      * 上级资源编码（可选，用于层级追溯）
      */
diff --git a/backend/src/main/java/com/yfd/platform/data/mapper/SysUserDataScopeMapper.java b/backend/src/main/java/com/yfd/platform/data/mapper/SysUserDataScopeMapper.java
index 8a592c2..3557ce2 100644
--- a/backend/src/main/java/com/yfd/platform/data/mapper/SysUserDataScopeMapper.java
+++ b/backend/src/main/java/com/yfd/platform/data/mapper/SysUserDataScopeMapper.java
@@ -43,4 +43,13 @@ public interface SysUserDataScopeMapper extends BaseMapper<SysUserDataScope> {
      * 查询有效权限（状态=1且在有效期内的）
      */
     List<SysUserDataScope> selectValidPermissions(@Param("userId") String userId);
+
+    /**
+     * 根据用户ID查询权限列表（含关联资源名称）
+     * orgType=STATION时关联SD_ENGINFO_B_H获取ennm（工程名称）
+     * orgType=HBRVCD时关联SD_HBRV_DIC获取hbrvnm（基地流域名称）
+     * orgType=BASE时关联SD_HYDROBASE获取basename（基地名称）
+     * orgType=RVCD时关联SD_RVCD_DIC获取rvnm（流域名称）
+     */
+    List<SysUserDataScope> selectValidPermissionsWithName(@Param("userId") String userId);
 }
diff --git a/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java b/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java
index 17f5f5d..a7e79b2 100644
--- a/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/data/service/impl/FishImportServiceImpl.java
@@ -1509,7 +1509,7 @@ public class FishImportServiceImpl implements IFishImportService {
                     String vdpth = data.getVdpth();
                     String picpth = data.getPicpth();
 
-                    if(StrUtil.isBlank(vdpth)||StrUtil.isBlank(picpth)){
+                    if(StrUtil.isBlank(vdpth) && StrUtil.isBlank(picpth)){
                         log.error("数据不完整, 忽略处理");
                         return;
                     }
diff --git a/backend/src/main/resources/mapper/data/SysUserDataScopeMapper.xml b/backend/src/main/resources/mapper/data/SysUserDataScopeMapper.xml
index 1fb8aa6..76194ae 100644
--- a/backend/src/main/resources/mapper/data/SysUserDataScopeMapper.xml
+++ b/backend/src/main/resources/mapper/data/SysUserDataScopeMapper.xml
@@ -72,4 +72,35 @@
         ORDER BY CREATED_AT DESC
     </select>
 
+    <select id="selectValidPermissionsWithName" resultMap="BaseResultMap">
+        SELECT
+            s.ID,
+            s.USER_ID,
+            s.ORG_TYPE,
+            s.ORG_ID,
+            s.PARENT_ID,
+            s.ORG_LEVEL,
+            s.PATH,
+            s.PERMISSION_TYPE,
+            s.ROLE_CODE,
+            s.DATA_SCOPE,
+            s.STATUS,
+            s.START_TIME,
+            s.END_TIME,
+            s.CREATED_AT,
+            s.CREATED_BY,
+            s.UPDATED_AT,
+            s.UPDATED_BY,
+            s.REMARK,
+            COALESCE(e.ennm, h.hbrvnm, b.basename, r.rvnm) AS orgName
+        FROM SYS_USER_DATA_SCOPE s
+        LEFT JOIN SD_ENGINFO_B_H e ON s.ORG_TYPE = 'STATION' AND s.ORG_ID = e.stcd
+        LEFT JOIN SD_HBRV_DIC h ON s.ORG_TYPE = 'HBRVCD' AND s.ORG_ID = h.hbrvcd
+        LEFT JOIN SD_HYDROBASE b ON s.ORG_TYPE = 'BASE' AND s.ORG_ID = b.baseid
+        LEFT JOIN SD_RVCD_DIC r ON s.ORG_TYPE = 'RVCD' AND s.ORG_ID = r.rvcd
+        WHERE s.USER_ID = #{userId}
+          AND s.STATUS = 1
+        ORDER BY s.CREATED_AT DESC
+    </select>
+
 </mapper>