From 869edb425d2e931d756c756c16ee5b3f42ee027a Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: Fri, 04 Aug 2023 13:49:20 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/gk/hotwork/Mapper/mybatis/CompanyInfoMapper.xml | 72 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gk/hotwork/Mapper/mybatis/CompanyInfoMapper.xml b/src/main/java/com/gk/hotwork/Mapper/mybatis/CompanyInfoMapper.xml
index 9297928..bb1cc7b 100644
--- a/src/main/java/com/gk/hotwork/Mapper/mybatis/CompanyInfoMapper.xml
+++ b/src/main/java/com/gk/hotwork/Mapper/mybatis/CompanyInfoMapper.xml
@@ -28,6 +28,7 @@
id,code,company, contactname, contactphone, ismain, province, city, area, town, community, isdel,
createdby,createddate, lastmodifiedby, lastmodifieddate, longitude, latitude, isbanned
</sql>
+<!--
<select id="selectDataGrid" resultType="com.gk.hotwork.Domain.CompanyInfo">
select *
from company
@@ -37,14 +38,17 @@
<if test="condition.company != null and condition.company !=''">
and company like concat('%',#{condition.company},'%')
</if>
+ <if test="condition.companyid != null ">
+ and id = #{condition.companyid}
+ </if>
<if test="condition.province != null and condition.province !=''">
- and province like concat('%',#{condition.province},'%')
+ and province = #{condition.province}
</if>
<if test="condition.city != null and condition.city !=''">
- and city like concat('%',#{condition.city},'%')
+ and city = #{condition.city}
</if>
<if test="condition.area != null and condition.area !=''">
- and area like concat('%',#{condition.area},'%')
+ and area = #{condition.area}
</if>
<if test="condition.town != null and condition.town !=''">
and town like concat('%',#{condition.town},'%')
@@ -57,6 +61,45 @@
</if>
</where>
</select>
+-->
+ <select id="selectDataGrid" resultType="com.gk.hotwork.Domain.CompanyInfo">
+ select c.*
+ from
+ (select *
+ from company
+ <where>
+ 1=1
+ and isdel = 0
+ <if test="condition.province != null and condition.province !=''">
+ and province = #{condition.province}
+ </if>
+ <if test="condition.city != null and condition.city !=''">
+ and city = #{condition.city}
+ </if>
+ <if test="condition.area != null and condition.area !=''">
+ and area = #{condition.area}
+ </if>
+ </where>
+ union
+ select *
+ from company
+ <where>1=1
+ and
+ isdel = 0
+ and province in(null,'')
+ </where>) c
+ <where>
+ 1=1
+ <if test="condition.company != null and condition.company !=''">
+ and c.company like concat('%',#{condition.company},'%')
+ </if>
+ <if test="condition.companyid != null ">
+ and c.id = #{condition.companyid}
+ </if>
+ </where>
+
+ </select>
+
<select id="selectExistByName" resultType="com.gk.hotwork.Domain.CompanyInfo">
select *
from company
@@ -84,4 +127,27 @@
</if>
limit 1
</select>
+ <select id="selectCompanyList" resultType="com.gk.hotwork.Domain.CompanyInfo">
+ select *
+ from company
+ <where>
+ 1=1
+ and isdel = 0
+ <if test="query.companyid != null and query.companyid !=''">
+ and id = #{query.companyid}
+ </if>
+ <if test="query.company != null and query.company !=''">
+ and company like concat('%',#{query.company},'%')
+ </if>
+ <if test="query.province != null and query.province !=''">
+ and province = #{query.province}
+ </if>
+ <if test="query.city != null and query.city !=''">
+ and city = #{query.city}
+ </if>
+ <if test="query.area != null and query.area !=''">
+ and area = #{query.area}
+ </if>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.2