From 2dab602bfbfb24dda3e086a008c29a5edcff05eb Mon Sep 17 00:00:00 2001 From: wangzhikun Date: Sat, 22 Apr 2023 19:05:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/dxhy/admin/sys/entity/SysDeptEntity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysDeptEntity.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysDeptEntity.java index d4358329..726aa1ce 100644 --- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysDeptEntity.java +++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysDeptEntity.java @@ -102,6 +102,8 @@ public class SysDeptEntity implements Serializable { private Date createTime; + private String autoRz; + private String productType; @TableField(exist = false) private List children; From 0d6f1d5b52b09a224f28164d09bf39b4a4f6c47c Mon Sep 17 00:00:00 2001 From: yefei Date: Sat, 22 Apr 2023 20:35:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ariesy=20=E4=BF=AE=E6=94=B9=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=E7=AD=BE=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java index 90e63bc3..e57c25b7 100644 --- a/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java +++ b/dxhy-sign/src/main/java/com/dxhy/sign/service/fpqs/impl/SignFpqsServiceImpl.java @@ -3385,10 +3385,11 @@ public class SignFpqsServiceImpl extends MpBaseServiceImpl selectWqsfp(Map pramsMap) { DynamicContextHolder.push("business_business_read"); + log.info("传入的导出数据列表id为:{}",pramsMap.get("ids")); if(pramsMap.get("ids") != null){ - String[] ids = String.valueOf(pramsMap.get("ids")).split(","); - List strings = Arrays.asList(ids); - pramsMap.put("ids",strings); +// String[] ids = String.valueOf(pramsMap.get("ids")).split(","); +// List strings = Arrays.asList(ids); + pramsMap.put("ids",pramsMap.get("ids")); } List pageList = super.baseMapper.selectWqsfpByQsyx(pramsMap); PageInfo pageInfo = new PageInfo<>(pageList);