zcloud_gbs
/
zcloud_gbs_personnel_positioning
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、bug修复

master
shenzhidan 2026-08-13 20:14:56 +08:00
parent d2195d9088
commit 961a87226e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalCardQueryExe.java
View File

@ -51,8 +51,12 @@ public class TerminalCardQueryExe {
public PageResponse<TerminalCardCO> listCardPage(TerminalCardPageQry qry) { public PageResponse<TerminalCardCO> listCardPage(TerminalCardPageQry qry) {
TerminalCardPageQry query = qry == null ? new TerminalCardPageQry() : qry; TerminalCardPageQry query = qry == null ? new TerminalCardPageQry() : qry;
Map<String, Object> params = PageQueryHelper.toHashMap(query); Map<String, Object> params = PageQueryHelper.toHashMap(query);
trim(params, "terminalNo", "staffName", "staffNo", "idCardNo", "eqCorpinfoId", trim(params, "terminalNo", "staffName", "staffNo", "idCardNo", "eqCorpinfoId", "corpinfoId",
"eqCorpinfoName", "likeCorpinfoName", "orgCode", "orgName", "deviceStatus"); "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"); applyCurrentCompany(params, "eqCorpinfoId", "eqCorpinfoName", "likeCorpinfoName");
PageResponse<TerminalCardDetailDO> page = terminalRepository.listCards(params); PageResponse<TerminalCardDetailDO> page = terminalRepository.listCards(params);
List<TerminalCardCO> rows = terminalCardCoConvertor.convertCards(page.getData()); List<TerminalCardCO> rows = terminalCardCoConvertor.convertCards(page.getData());

3
web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPageQry.java
View File

@ -21,6 +21,9 @@ public class TerminalCardPageQry extends PageQuery {
@ApiModelProperty(value = "公司ID，精确匹配", name = "eqCorpinfoId") @ApiModelProperty(value = "公司ID，精确匹配", name = "eqCorpinfoId")
private Long eqCorpinfoId; private Long eqCorpinfoId;
@ApiModelProperty(value = "公司ID，兼容页面传参", name = "corpinfoId")
private Long corpinfoId;
@ApiModelProperty(value = "公司名称，精确匹配", name = "eqCorpinfoName") @ApiModelProperty(value = "公司名称，精确匹配", name = "eqCorpinfoName")
private String eqCorpinfoName; private String eqCorpinfoName;