From 4cac70cb7a7026186eddbc4abbf12f31171daa42 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Mon, 25 Aug 2025 19:21:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../heating/controller/ThermalcompanyController.java      | 3 ++-
 .../java/org/jeecg/modules/heating/entity/Heatsource.java | 8 ++++++--
 .../org/jeecg/modules/heating/entity/Thermalcompany.java  | 7 ++++++-
 .../jeecg/modules/heating/mapper/xml/HeatsourceMapper.xml | 5 +++--
 .../modules/heating/mapper/xml/ThermalcompanyMapper.xml   | 5 +++--
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/ThermalcompanyController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/ThermalcompanyController.java
index b303a2b..4e47e3e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/ThermalcompanyController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/controller/ThermalcompanyController.java
@@ -34,7 +34,7 @@ public class ThermalcompanyController extends JeecgController<Thermalcompany, Th
 
 	/**
 	 * 列表查询
-	 * 
+	 *
 	 * @param thermalcompany
 	 * @param req
 	 * @return
@@ -68,6 +68,7 @@ public class ThermalcompanyController extends JeecgController<Thermalcompany, Th
 		customeRuleMap.put("companyType", QueryRuleEnum.LIKE_WITH_OR);
 		customeRuleMap.put("companyName", QueryRuleEnum.LIKE_WITH_OR);
 		QueryWrapper<Thermalcompany> queryWrapper = QueryGenerator.initQueryWrapper(thermalcompany, req.getParameterMap(),customeRuleMap);
+		queryWrapper.eq("region_type",thermalcompany.getRegionType());
 		Page<Thermalcompany> page = new Page<Thermalcompany>(pageNo, pageSize);
 		IPage<Thermalcompany> pageList = thermalcompanyService.page(page, queryWrapper);
 		return Result.OK(pageList);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java
index 21659f7..fdca209 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java
@@ -171,5 +171,9 @@ public class Heatsource implements Serializable {
 	private Date updateDate;
 	@TableField(exist = false)
 	private String typeFlag; // 类型标识 1热源 2换热站
-	
-}
\ No newline at end of file
+	/**地区类型*/
+	@Excel(name = "地区类型", width = 15)
+	@ApiModelProperty(value = "地区类型")
+	private java.lang.String regionType;
+
+}
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Thermalcompany.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Thermalcompany.java
index 5bfad6e..629ed11 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Thermalcompany.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Thermalcompany.java
@@ -141,4 +141,9 @@ public class Thermalcompany implements Serializable {
 	@Excel(name = "排序ID", width = 15)
 	@ApiModelProperty(value = "排序ID")
 	private java.lang.Integer orderId;
-}
\ No newline at end of file
+	/**地区类型*/
+	@Excel(name = "地区类型", width = 15)
+	@ApiModelProperty(value = "地区类型")
+	private java.lang.String regionType;
+
+}
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatsourceMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatsourceMapper.xml
index 8f810f3..b683aa1 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatsourceMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatsourceMapper.xml
@@ -60,7 +60,8 @@
         FROM BL_heatsource a
         <include refid="heatsourceJoins"/>
         <where>
-            a.del_flag = '0'
+			a.region_type = #{regionType}
+            AND a.del_flag = '0'
             <if test="sourceName != null and sourceName != ''">
                 AND a.source_name LIKE concat('%',#{sourceName},'%')
             </if>
@@ -76,4 +77,4 @@
         </where>
 		ORDER BY a.id
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/ThermalcompanyMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/ThermalcompanyMapper.xml
index 9fd9dcc..71c11a6 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/ThermalcompanyMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/ThermalcompanyMapper.xml
@@ -40,7 +40,8 @@
         FROM BL_thermalcompany a
         <include refid="thermalcompanyJoins"/>
         <where>
-            AND  del_flag = '0'
+        	a.region_type = #{regionType}
+            AND  a.del_flag = '0'
             <if test="companyName != null and companyName != ''">
                 AND a.company_name LIKE concat('%',#{companyName},'%')
             </if>
@@ -53,4 +54,4 @@
         </where>
         ORDER BY a.id
     </select>
-</mapper>
\ No newline at end of file
+</mapper>