From 411ebc9c06c2f987b4d8deb2a9a1496ab39b55ea Mon Sep 17 00:00:00 2001
From: huangh <hshgjzd5@163.com>
Date: Mon, 28 Oct 2024 16:34:39 +0800
Subject: [PATCH] Merge branch 'faeture/gzdyh_countRepeated_20241025' into gzdyh_test
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java
index baebe8c..7d4e76b 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/service/CasedraftInfoService.java
@@ -135,7 +135,9 @@
* @param terms 条件
* @return Page
*/
- public Page<CasedraftInfo> pageQuery(PageRequest page, Map<String, Object> terms){
+ public Page<CasedraftInfo> pageQuery(PageRequest page, Map<String, Object> terms,String userId){
+ CtUserDTO loginUser = custClient.clientGetUserAll(userId);
+ terms.put("inputUnitId", loginUser.getUnitId());
long total = mapper.countTerms(terms);
List<CasedraftInfo> content = mapper.pageTerms(page, terms);
return new PageImpl<CasedraftInfo>(content, page, total);
@@ -180,6 +182,11 @@
CasedraftInfo casedraftInfo = new CasedraftInfo();
BeanUtils.copyProperties(draftRegisterSaveDTO, casedraftInfo);
+ //默认添加省市
+ casedraftInfo.setQueProv("19");
+ casedraftInfo.setQueProvName("广东省");
+ casedraftInfo.setQueCity("1601");
+ casedraftInfo.setQueCityName("广州市");
casedraftInfo.setCustId(loginUser.getCustId());
casedraftInfo.setUpdateTime(nowDate);
// 常规登记-保存当事人
--
Gitblit v1.8.0