2026-10-08

Site取值调整

src/main/java/com/heai/modules/production/entity/SiteData.java

@@ -6,6 +6,11 @@ public class SiteData {
      */
     private String siteID;
 
+    /**
+     *
+     */
+    private String shortSiteName;
+
     /**
      *
      */
@@ -66,6 +71,11 @@ public class SiteData {
      */
     private String companyID;
 
+    /**
+     * 查询条件：当前用户，用于按 AccessSite 过滤授权工厂
+     */
+    private String userID;
+
     public String getSiteID() {
         return siteID;
     }
@@ -74,6 +84,14 @@ public class SiteData {
         this.siteID = siteID;
     }
 
+    public String getShortSiteName() {
+        return shortSiteName;
+    }
+
+    public void setShortSiteName(String shortSiteName) {
+        this.shortSiteName = shortSiteName;
+    }
+
     public String getSiteName() {
         return siteName;
     }
@@ -169,5 +187,13 @@ public class SiteData {
     public void setCompanyID(String companyID) {
         this.companyID = companyID;
     }
+
+    public String getUserID() {
+        return userID;
+    }
+
+    public void setUserID(String userID) {
+        this.userID = userID;
+    }
 }
 

src/main/resources/mapper/board/BoardMapper.xml

@@ -298,7 +298,12 @@
     </select>
 
         <select id="getSiteData" resultType="com.heai.modules.production.entity.SiteData">
-            Select *  from Site
+            SELECT s.SiteID, s.ShortSiteName AS shortSiteName, s.SiteName, s.SiteName_E, s.Address, s.Address_E, s.ContactName, s.PostCode, s.Email, s.FaxNo, s.PhoneNo, s.Active, s.Website, s.CompanyID
+            FROM Site s
+            <if test="userID != null and userID != ''">
+                INNER JOIN AccessSite a ON a.Site = s.SiteID AND a.UserID = #{userID}
+            </if>
+            ORDER BY s.SiteID
          </select>
 
          <update id="updatePrintFlag" >