From 99d206d8dea36503d3fd9bb4157ea40aed81a8c3 Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Fri, 29 Nov 2024 15:28:49 +0800
Subject: [PATCH] 1127

---
 .../modules/base/controller/BaseController.java  | 16 ++++++++++++++++
 .../com/spring/modules/base/dao/BaseMapper.java  |  1 +
 .../spring/modules/base/service/BaseService.java |  2 +-
 .../base/service/Impl/BaseServiceImpl.java       |  6 ++++++
 src/main/resources/mapper/base/BaseMapper.xml    | 14 +++++++++++++-
 5 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/spring/modules/base/controller/BaseController.java b/src/main/java/com/spring/modules/base/controller/BaseController.java
index c9334dd5..002af693 100644
--- a/src/main/java/com/spring/modules/base/controller/BaseController.java
+++ b/src/main/java/com/spring/modules/base/controller/BaseController.java
@@ -65,6 +65,22 @@ public class BaseController extends AbstractController {
         }
         return map;
     }
+
+    @PostMapping(value = "/getSiteDataActive")
+    @ResponseBody
+    public Object getSiteDataActive(@RequestBody SiteData inData) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            List<SiteData> result = baseService.getSiteDataActive(inData);
+            map.put("success", true);
+            map.put("rows", result);
+            map.put("total", result.size());
+        } catch (Exception e) {
+            map.put("success", false);
+            map.put("msg", e.getMessage());
+        }
+        return map;
+    }
     
     /**
      * @Description 获取角色下的工厂权限
diff --git a/src/main/java/com/spring/modules/base/dao/BaseMapper.java b/src/main/java/com/spring/modules/base/dao/BaseMapper.java
index 33ff1d95..d5b02010 100644
--- a/src/main/java/com/spring/modules/base/dao/BaseMapper.java
+++ b/src/main/java/com/spring/modules/base/dao/BaseMapper.java
@@ -36,6 +36,7 @@ public interface BaseMapper {
      * @throw
      */
     List<SiteData> getSiteData(SiteData inData);
+    List<SiteData> getSiteDataActive(SiteData inData);
     /**
      * @Description 获取角色下的工厂权限
      * @Title getUserAccessSite
diff --git a/src/main/java/com/spring/modules/base/service/BaseService.java b/src/main/java/com/spring/modules/base/service/BaseService.java
index 3427fd0a..ac4cc24d 100644
--- a/src/main/java/com/spring/modules/base/service/BaseService.java
+++ b/src/main/java/com/spring/modules/base/service/BaseService.java
@@ -31,7 +31,7 @@ public interface BaseService {
      * @throw
      */
     List<SiteData> getSiteData(SiteData inData);
-
+    List<SiteData> getSiteDataActive(SiteData inData);
     /**
      * @Description 获取角色下的工厂权限
      * @Title getUserAccessSite
diff --git a/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java b/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java
index ac8afc41..0acd5124 100644
--- a/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java
+++ b/src/main/java/com/spring/modules/base/service/Impl/BaseServiceImpl.java
@@ -72,6 +72,12 @@ public class BaseServiceImpl implements BaseService {
         return result;
     }
 
+    @Override
+    public List<SiteData> getSiteDataActive(SiteData inData) {
+        List<SiteData> result = baseMapper.getSiteDataActive(inData);
+        return result;
+    }
+
     @Override
     public List<SiteData> getUserAccessSite(UserEntity inData) {
         List<SiteData> result = baseMapper.getUserAccessSite(inData);
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index d5b325b1..e359c92e 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -14,12 +14,24 @@
                 AND C.CompanyName = #{companyName}
             </if>
         </where>
+    </select>
+        <select id="getSiteDataActive" resultType="com.spring.modules.base.entity.SiteData">
+        Select T.* ,C.CompanyName from Site as T left join Company C ON T.CompanyID=C.CompanyID
+        <where>
+         and t.active='Y'
+            <if test="companyID != null and companyID != ''">
+                AND T.CompanyID = #{companyID}
+            </if>
+            <if test="companyName != null and companyName != ''">
+                AND C.CompanyName = #{companyName}
+            </if>
+        </where>
     </select>
     <select id="getUserAccessSite" resultType="com.spring.modules.base.entity.SiteData">
         select b.SiteID,b.SiteName
         from AccessSite a
         left join site b on a.Site=b.SiteID
-        where UserID=#{username}
+        where UserID=#{username} and b.active='Y'
     </select>
     <select id="getCompanyData" resultType="com.spring.modules.base.entity.CompanyData">
         Select CompanyID,