From abaf72a337248943e037b02d069c094e2ee5d60b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 05 Jul 2023 14:46:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
index a79b3b3..4726595 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
@@ -57,27 +57,12 @@
@Override
public Object getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,Map<String, Object> params) {
- Object adCode = params.get("adCode");
- Object adGrad = params.get("adGrad");
- String ad_code = "";
- String p_ad_code = "";
- String code = adCode.toString();
- if (adGrad.toString().equals("1")) {
- p_ad_code = code.substring(0,2);
- } else if (adGrad.toString().equals("2")) {
- p_ad_code = code.substring(0,4);
- } else if (adGrad.toString().equals("3")) {
- p_ad_code = code.substring(0,7);
- } else {
- ad_code = code;
- }
-
Object isExport = params.get("isExport");
// 判断是否导出，导出不分页
if (null != isExport && !isExport.equals("")) {
- return baseMapper.getAttResBaseUserPage(null,ad_code,p_ad_code,params);
+ return baseMapper.getAttResBaseUserPage(null,params);
}
- List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,ad_code,p_ad_code,params);
+ List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,params);
// 返回数据
return page.setRecords(attResBaseUserDTOList);
}
--
Gitblit v1.9.3