fix(jg):设备编辑报错问题处理

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/BizDataChangeController.java

@@ -101,7 +101,7 @@ public class BizDataChangeController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/v2/{bizType}/change-logs")
     @ApiOperation(value = "编辑一级页面详情查询--通用", httpMethod = "GET")
-    public ResponseModel<IPage<?>> getChangeLogPage(@ApiParam(value = "设备或者装置唯一标识") @RequestParam String bizId,
+    public ResponseModel<IPage<?>> getChangeLogPage(@ApiParam(value = "设备或者装置唯一标识") @RequestParam(value = "bizId", required = false) String bizId,
                                                     @ApiParam(required = true, value = "业务类型") @PathVariable String bizType,
                                                     @RequestParam(value = "current") int current,
                                                     @RequestParam(value = "size") int size) {

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/BizDataChangeServiceImpl.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.edit;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.annotation.ResultFieldMapping;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jg.api.dto.RequestChangeData;
@@ -52,8 +53,10 @@ public class BizDataChangeServiceImpl {
     }
 
     public IPage<?> getChangeLogPage(String bizId, String bizType, int current, int size) {
+        if (bizId == null || bizId.isEmpty()) {
+            return new Page<>(current, size);
+        }
         IBizDataChangeHandleStrategy handleStrategy = BizDataHandleStrategyContext.getStrategy(bizType);
         return handleStrategy.getChangeLogs(bizId, current, size);
     }
-
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/biz/useRegister/UseRegisterUpdateService.java

 package com.yeejoin.amos.boot.module.jg.biz.edit.process.biz.useRegister;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -30,10 +31,7 @@ import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -105,8 +103,8 @@ public class UseRegisterUpdateService {
      */
     public void updateUseRegistrationInfo(String bizId, List<FieldChangeMeta> allChangeColumns) {
         Map<String, Object> useRegistrationMap = jgUseRegistrationService.getJgUseRegistrationMapper().getUseRegistrationDetail(bizId);
-        JgUseRegistration jgUseRegistration = jgUseRegistrationService.getById(useRegistrationMap.get("UseRegistratSequenceNbr").toString());
-        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getDteailByRecord(bizId, useRegistrationMap.get("UseRegistratSequenceNbr").toString());
+        JgUseRegistration jgUseRegistration = jgUseRegistrationService.getById(Objects.toString(useRegistrationMap.get("UseRegistratSequenceNbr")));
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryService.getDteailByRecord(bizId, MapUtil.getStr(useRegistrationMap,"UseRegistratSequenceNbr"));
         allChangeColumns.forEach(meta -> {
             if (!ValidationUtil.isEmpty(jgUseRegistration)) {
                 // 更新接收机构