From 6be487f1170b529ac8524077588c259feb13fe77 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Tue, 18 Apr 2023 14:52:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/sync/SpsSyncDownloadController.java | 2 +- .../java/com/glxp/api/service/sync/SpsSyncDownloadService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index 7d30f643..77e6fdd7 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -156,7 +156,7 @@ public class SpsSyncDownloadController { BaseResponse baseResponse = new BaseResponse<>(); SpsSyncBasicDataResponse spsSyncBasicDataResponse = new SpsSyncBasicDataResponse(); BasicExportStatusEntity one = basicExportService.getOne(Wrappers.lambdaQuery(BasicExportStatusEntity.class) - .eq(BasicExportStatusEntity::getType, BasicExportTypeEnum.BASIC_DATA) + .eq(BasicExportStatusEntity::getType, BasicExportTypeEnum.BASIC_DATA.getRemark()) .orderByDesc(BasicExportStatusEntity::getStartTime) .last("limit 1") ); diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java index 4789d5ff..7fbce9fb 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java +++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java @@ -192,7 +192,7 @@ public class SpsSyncDownloadService { throw new Exception(errorMsg); } BasicExportStatusEntity exportStatus = basicExportService.getOne(Wrappers.lambdaQuery(BasicExportStatusEntity.class) - .eq(BasicExportStatusEntity::getType, BasicExportTypeEnum.BASIC_DATA) + .eq(BasicExportStatusEntity::getType, BasicExportTypeEnum.BASIC_DATA.getRemark()) .orderByDesc(BasicExportStatusEntity::getStartTime) .last("limit 1") ); From 5d56f8f5b9b0850e5848525705975489f77d5421 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 18 Apr 2023 14:55:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/auth/SysUserController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index 6d97faae..5ea31ca1 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -210,6 +210,9 @@ public class SysUserController extends BaseController { // userService.insertUserAuth1(sysUserRole); //默认插入第一部门 List deptCodeList=authUserSaveRequest.getDepts(); + if(deptCodeList == null){ + deptCodeList=new ArrayList<>(); + } deptCodeList.add(1L); authUserSaveRequest.setDepts(deptCodeList);