站点管理下拉框修改

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/SiteMapper.java

@@ -27,6 +27,9 @@ public interface SiteMapper extends CrudMapper<Site> {
                     @Param("name") String name,
                     @Param("tenantId") Integer tenantId);
 
+    List<Site> listOne(@Param("name") String name,
+                       @Param("tenantId") Integer tenantId);
+
     List<SiteTwo> list2(@Param("userId") Integer userId,
                         @Param("name") String name);
 

fiveep-persistence/src/main/resources/mapper/mysql/SiteMapper.xml

@@ -51,7 +51,9 @@
         on us.site_id = s.id
         <where>
             s.enable=1
-            and s.tenant_id=#{tenantId}
+            <if test="tenantId != null and tenantId != 0 and tenantId != ''">
+                and s.tenant_id=#{tenantId}
+            </if>
             <if test="userId != null and userId != 0">
                 and us.user_id = #{userId}
             </if>
@@ -62,6 +64,21 @@
         </where>
     </select>
 
+    <select id="listOne" resultType="com.bizmatics.model.Site">
+        select s.id,s.site_name,s.site_address,s.company_code,s.user_name,s.phone,s.station_area_id,s.route_id,
+        s.installed_capacity,s.rheological_change,s.longitude,s.latitude,s.region,s.create_time,s.creator,s.enable
+        from  site as s
+        <where>
+            s.enable=1
+            <if test="tenantId != null and tenantId != 0 and tenantId != ''">
+                and s.tenant_id=#{tenantId}
+            </if>
+            <if test="name != null and name != ''">
+                and s.site_name LIKE CONCAT(CONCAT('%', #{name}), '%')
+            </if>
+        </where>
+    </select>
+
     <select id="list2" resultType="com.bizmatics.model.SiteTwo">
         SELECT
         a.*, b.device_status

fiveep-service/src/main/java/com/bizmatics/service/impl/SiteServiceImpl.java

@@ -74,7 +74,13 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         if (tenantDaya.size() < 0) {
             throw new BusinessException("无此租户，请联系管理员");
         }
-        return baseMapper.list(userId, name, tenantDaya.get(0).getTenantId());
+        List<Site> siteList = new ArrayList<>();
+        if (tenantDaya.get(0).getUserType().equals("01")){
+            siteList = baseMapper.listOne(name, tenantDaya.get(0).getTenantId());
+        }else if (tenantDaya.get(0).getUserType().equals("00")){
+            siteList = baseMapper.list(userId, name, tenantDaya.get(0).getTenantId());
+        }
+        return siteList;
     }
 
     @Override