diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalCardQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalCardQueryExe.java index e71d123..7570851 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalCardQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalCardQueryExe.java @@ -51,8 +51,12 @@ public class TerminalCardQueryExe { public PageResponse listCardPage(TerminalCardPageQry qry) { TerminalCardPageQry query = qry == null ? new TerminalCardPageQry() : qry; Map params = PageQueryHelper.toHashMap(query); - trim(params, "terminalNo", "staffName", "staffNo", "idCardNo", "eqCorpinfoId", + trim(params, "terminalNo", "staffName", "staffNo", "idCardNo", "eqCorpinfoId", "corpinfoId", "eqCorpinfoName", "likeCorpinfoName", "orgCode", "orgName", "deviceStatus"); + // 页面使用corpinfoId,持久层统一使用eqCorpinfoId作为公司精确过滤条件。 + if (params.get("eqCorpinfoId") == null && params.get("corpinfoId") != null) { + params.put("eqCorpinfoId", params.get("corpinfoId")); + } applyCurrentCompany(params, "eqCorpinfoId", "eqCorpinfoName", "likeCorpinfoName"); PageResponse page = terminalRepository.listCards(params); List rows = terminalCardCoConvertor.convertCards(page.getData()); diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPageQry.java index 9085cf8..8eb6365 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPageQry.java @@ -21,6 +21,9 @@ public class TerminalCardPageQry extends PageQuery { @ApiModelProperty(value = "公司ID,精确匹配", name = "eqCorpinfoId") private Long eqCorpinfoId; + @ApiModelProperty(value = "公司ID,兼容页面传参", name = "corpinfoId") + private Long corpinfoId; + @ApiModelProperty(value = "公司名称,精确匹配", name = "eqCorpinfoName") private String eqCorpinfoName;