From 229cdb3d5692219b8ddd3ebcf13873d3a0bc703a Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Thu, 26 Sep 2024 10:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java
index 95fa9eb..7f8acda 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java
@@ -1,6 +1,7 @@
package cn.huge.module.grid.controller.web;
import cn.huge.base.common.bo.R;
+import cn.huge.base.common.utils.AesUtils;
import cn.huge.base.common.utils.ObjectUtils;
import cn.huge.base.common.utils.ReturnFailUtils;
import cn.huge.base.common.utils.ReturnSucUtils;
@@ -43,7 +44,7 @@
public Object pageQuery(@RequestParam(value = "page") int page, @RequestParam(value = "size") int size) {
try {
GridCompanyVo gridCompanyVo = new GridCompanyVo();
- String integratedQuery = request.getParameter("trueName");
+ String integratedQuery = request.getParameter("integratedQuery");
gridCompanyVo.setIntegratedQuery(integratedQuery);
gridCompanyVo.setPage(page);
gridCompanyVo.setPageSize(size);
@@ -52,6 +53,7 @@
Page<GridCompanyDTO.UnitDTO> unitDTOPage = gridCompanyService.pageQuery(gridCompanyVo);
for (GridCompanyDTO.UnitDTO unitDTO: unitDTOPage){
CasePersonDTO casePersonDTO = new CasePersonDTO();
+ casePersonDTO.setCompanyId(unitDTO.getId());
casePersonDTO.setTrueName(unitDTO.getName());
casePersonDTO.setOrgaCode(unitDTO.getSocialCreditCode());
casePersonDTO.setAddr(unitDTO.getBusinessRegAddress());
--
Gitblit v1.8.0