diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java index 65b1a5c4..d5cf916a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java @@ -53,7 +53,7 @@ public class StandSystemDTO { private String standName; @ApiModelProperty(value = "标准状态") - @Excel(name = "文本状态", width = 25, orderNum = "4") + @Excel(name = "标准状态", width = 25, orderNum = "4") private String standState; @ApiModelProperty(value = "文本状态") diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index 7e4d87c4..3dcaf149 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -255,6 +255,10 @@ AND gba.WSSMR LIKE CONCAT('%',#{param.draftUserName},'%') + + AND gb.TEXT_STATUS = #{param.standState} + + AND gb.STAND_TYPE = #{param.dataSource} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index fbbc6ef0..d45e8bca 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1340,6 +1340,10 @@ AND esa.QCRBUSS LIKE CONCAT('%',#{param.draftUserName},'%') + + + AND es.TEXT_STATUS_BUSS = #{param.standState} + AND 'ENTERPRISE' = #{param.dataSource}