菜单拆分

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);

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换热站
-	
-}
+	/**地区类型*/
+	@Excel(name = "地区类型", width = 15)
+	@ApiModelProperty(value = "地区类型")
+	private java.lang.String regionType;
+
+}

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;
-}
+	/**地区类型*/
+	@Excel(name = "地区类型", width = 15)
+	@ApiModelProperty(value = "地区类型")
+	private java.lang.String regionType;
+
+}

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>
+</mapper>

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>
+</mapper>