diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java index 3961fbd..d8022d0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java @@ -155,7 +155,7 @@ public class AssetAppCpPo extends BaseClass implements Serializable { private Integer count; @ApiModelProperty("app状态") - private Integer appState; + private String appState; /** * 单位自己编辑的审核状态(1未审批 2审批通过 3审批驳回) diff --git a/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml index 21cb9ed..17056f9 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml @@ -20,7 +20,7 @@ left join sys_dept c on b.dept_id = c.dept_id left join asset_app_cp e on a.id = e.asset_id - a.del_flag = '0' and e.task_id is null and e.audit_state is not null + a.del_flag = '0' and e.task_id is null and a.app_name like concat('%',#{req.yymc},'%') diff --git a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml index f8480d3..e36e978 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml @@ -18,7 +18,7 @@ left join sys_dept c on b.dept_id = c.dept_id left join asset_current_cp e on a.id = e.id - a. del_flag = '0' and e.task_id is null and e.audit_state is not null + a. del_flag = '0' and e.task_id is null and a.xtmc like concat('%',#{req.xtmc},'%') diff --git a/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml index 0cd6c00..07b0e07 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml @@ -20,7 +20,7 @@ left join sys_dept c on b.dept_id = c.dept_id left join asset_email_cp e on a.id = e.asset_id - a.del_flag = '0' and e.task_id is null and e.audit_state is not null + a.del_flag = '0' and e.task_id is null and a.dzyxhz like concat('%',#{req.dzyxhz},'%') diff --git a/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml index e0456f1..03df5f9 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml @@ -20,7 +20,7 @@ left join sys_dept c on b.dept_id = c.dept_id left join asset_mini_programs_cp e on a.id = e.asset_id - a.del_flag = '0' and e.task_id is null and e.audit_state is not null + a.del_flag = '0' and e.task_id is null and a.xcxmc like concat('%',#{req.xcxmc},'%') diff --git a/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml index bfbd746..054075e 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml @@ -24,7 +24,7 @@ left join sys_dept c on b.dept_id = c.dept_id left join asset_official_account_cp e on a.id = e.asset_id - a.del_flag = '0' and e.task_id is null and e.audit_state is not null + a.del_flag = '0' and e.task_id is null and a.gzhmc like concat('%',#{req.gzhmc},'%')