From 04f39952056d5b7ffae17d5cff13058be3e47563 Mon Sep 17 00:00:00 2001
From: b2894lxlx <517289602@qq.com>
Date: Sun, 27 Oct 2024 15:17:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E5=90=88?=
 =?UTF-8?q?=E4=BD=9C=E5=8D=95=E4=BD=8D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/mapper/xml/OrganizationMapper.xml  | 25 +++++++++++--------
 .../system/param/OrganizationParam.java       |  4 +++
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml
index 47721a3..eaac82f 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/OrganizationMapper.xml
@@ -45,30 +45,33 @@
                 AND a.organization_type = #{param.organizationType}
             </if>
             <if test="param.province != null">
-              AND a.province = #{param.province}
+                AND a.province = #{param.province}
             </if>
             <if test="param.city != null">
-              AND a.city = #{param.city}
+                AND a.city = #{param.city}
             </if>
             <if test="param.province != null">
-              AND a.region = #{param.province}
+                AND a.region = #{param.province}
             </if>
             <if test="param.zipCode != null">
-              AND a.zip_code = #{param.zipCode}
+                AND a.zip_code = #{param.zipCode}
             </if>
             <if test="param.park != null">
-              AND a.park LIKE CONCAT('%', #{param.park}, '%')
+                AND a.park LIKE CONCAT('%', #{param.park}, '%')
             </if>
             <if test="param.image != null">
-              AND a.image LIKE CONCAT('%', #{param.image}, '%')
+                AND a.image LIKE CONCAT('%', #{param.image}, '%')
             </if>
             <if test="param.about != null">
-              AND a.about LIKE CONCAT('%', #{param.about}, '%')
+                AND a.about LIKE CONCAT('%', #{param.about}, '%')
             </if>
             <if test="param.leaderId != null">
                 AND a.leader_id = #{param.leaderId}
             </if>
-             <if test="param.estateOnly != null">
+            <if test="param.isCoop != null">
+                AND a.is_coop = #{param.isCoop}
+            </if>
+            <if test="param.estateOnly != null">
                 AND a.estate IS NOT null
             </if>
             <if test="param.comments != null">
@@ -90,9 +93,9 @@
                 AND c.username LIKE CONCAT('%', #{param.leaderUsername}, '%')
             </if>
             <if test="param.keywords != null">
-              AND (
-              a.organization_name LIKE CONCAT('%', #{param.keywords}, '%')
-              )
+                AND (
+                a.organization_name LIKE CONCAT('%', #{param.keywords}, '%')
+                )
             </if>
         </where>
     </sql>
diff --git a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java
index 92ac123..bd9568f 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/OrganizationParam.java
@@ -114,6 +114,10 @@ public class OrganizationParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer leaderId;
 
+    @ApiModelProperty(value = "是否合作单位")
+    @QueryField(type = QueryType.EQ)
+    private Integer isCoop;
+
     @ApiModelProperty(value = "备注")
     private String comments;