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} - AND a.province = #{param.province} + AND a.province = #{param.province} - AND a.city = #{param.city} + AND a.city = #{param.city} - AND a.region = #{param.province} + AND a.region = #{param.province} - AND a.zip_code = #{param.zipCode} + AND a.zip_code = #{param.zipCode} - AND a.park LIKE CONCAT('%', #{param.park}, '%') + AND a.park LIKE CONCAT('%', #{param.park}, '%') - AND a.image LIKE CONCAT('%', #{param.image}, '%') + AND a.image LIKE CONCAT('%', #{param.image}, '%') - AND a.about LIKE CONCAT('%', #{param.about}, '%') + AND a.about LIKE CONCAT('%', #{param.about}, '%') AND a.leader_id = #{param.leaderId} - + + AND a.is_coop = #{param.isCoop} + + AND a.estate IS NOT null @@ -90,9 +93,9 @@ AND c.username LIKE CONCAT('%', #{param.leaderUsername}, '%') - AND ( - a.organization_name LIKE CONCAT('%', #{param.keywords}, '%') - ) + AND ( + a.organization_name LIKE CONCAT('%', #{param.keywords}, '%') + ) 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;