Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java

@@ -184,10 +184,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         List<Map<String, Object>> equipmentInfos = JgChangeRegistrationUnitMapper.queryEquipInformation(sequenceNbr);
 
         for (String s : fields) {
-            if (changeInfo.containsKey(s)) {
+            if (changeInfo.containsKey(s) && !ObjectUtils.isEmpty(changeInfo.get(s))) {
                 changeInfo.put(s, JSON.parseArray(changeInfo.get(s).toString()));
             }
-            if (equipmentInfos.get(0).containsKey(s)) {
+            if (equipmentInfos.get(0).containsKey(s)  && !ObjectUtils.isEmpty(equipmentInfos.get(0).get(s))) {
                 equipmentInfos.get(0).put(s, JSON.parseArray(equipmentInfos.get(0).get(s).toString()));
             }
         }