diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java index b9ad0155..40bf6d72 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/CorpDepartmentQry.java @@ -32,8 +32,8 @@ public class CorpDepartmentQry extends PageQuery { @ApiModelProperty(value = "分公司名称", name = "likeCorpName") private String likeCorpName; - @ApiModelProperty(value = "分公司状态编码", name = "eqCorpStateCode") - private String eqCorpStateCode; + @ApiModelProperty(value = "分公司状态编码", name = "eqCorpState") + private String eqCorpState; @ApiModelProperty(value = "是否启用,1:启用,0:关闭", name = "eqUseFlag") private String eqUseFlag; diff --git a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml index e542e7d9..5883bd7d 100644 --- a/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/CorpInfoMapper.xml @@ -37,6 +37,12 @@ AND c.village = #{params.eqVillage} + + AND c.use_flag = #{params.eqUseFlag} + + + AND c.corp_state = #{params.eqCorpState} + group by c.id ORDER BY c.corp_order ASC,