From 8be6694f823cd3aa859ceb4784b3d1a5c41cc8a3 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 04 四月 2023 10:58:58 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/ApplyService.java | 7 ++++++-
data/db_cx.sql | 5 ++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/data/db_cx.sql b/data/db_cx.sql
index 81ea7f8..c55528d 100644
--- a/data/db_cx.sql
+++ b/data/db_cx.sql
@@ -18,9 +18,8 @@
select * from lf.sys_dir where pid=0
select * from lf.sys_apply order by id desc
select * from lf.sys_flow order by id desc;
--- delete from lf.sys_apply where id in (37,38); delete from lf.sys_flow where applyid in (37, 38);
-
-
+-- delete from lf.sys_apply where id > 40; delete from lf.sys_flow where applyid > 40;
+select * from lf.sys_download order by id desc
diff --git a/src/main/java/com/lf/server/service/show/ApplyService.java b/src/main/java/com/lf/server/service/show/ApplyService.java
index 3483cbb..f1863e0 100644
--- a/src/main/java/com/lf/server/service/show/ApplyService.java
+++ b/src/main/java/com/lf/server/service/show/ApplyService.java
@@ -153,6 +153,7 @@
private ApplyEntity getApplyEntity(UserEntity ue, DownloadReqEntity dr) throws Exception {
// String dbPwd = Md5Helper.reverse(Md5Helper.generate(dr.getPwd()))
String aesPwd = AesHelper.encrypt(dr.getPwd());
+ String gids = null == dr.getIds() || dr.getIds().isEmpty() ? null : StringHelper.join(dr.getIds(), ",");
ApplyEntity apply = new ApplyEntity();
apply.setUserid(ue.getId());
@@ -167,7 +168,7 @@
apply.setCreateUser(ue.getId());
apply.setDepcode(dr.getDepcode());
apply.setDircodes(dr.getDirs());
- apply.setGids(StringHelper.join(dr.getIds(), ","));
+ apply.setGids(gids);
apply.setFilters(dr.getFilter());
return apply;
@@ -225,6 +226,10 @@
* 鑾峰彇ID闆嗗悎
*/
private List<Integer> getIds(ApplyEntity entity) {
+ if (StringHelper.isEmpty(entity.getGids())) {
+ return null;
+ }
+
List<Integer> list = new ArrayList<>();
for (String str : entity.getGids().split(StaticData.COMMA)) {
list.add(Integer.parseInt(str));
--
Gitblit v1.9.3