Merge remote-tracking branch 'origin/master'

src/main/java/com/glxp/api/controller/auth/SysUserController.java

@@ -210,6 +210,9 @@ public class SysUserController extends BaseController {
 //        userService.insertUserAuth1(sysUserRole);
         //默认插入第一部门
         List<Long> deptCodeList=authUserSaveRequest.getDepts();
+        if(deptCodeList == null){
+            deptCodeList=new ArrayList<>();
+        }
         deptCodeList.add(1L);
         authUserSaveRequest.setDepts(deptCodeList);
 

src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java

@@ -156,7 +156,7 @@ public class SpsSyncDownloadController {
         BaseResponse<SpsSyncBasicDataResponse> 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")
         );

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")
         );