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/CommonServiceImpl.java

@@ -2328,9 +2328,9 @@ public class CommonServiceImpl implements ICommonService {
             wrapper.eq(AbstractEquipBaseEntity::getRecord,formData.getString("equipId"));
             wrapper.orderByDesc(AbstractEquipBaseEntity::getRecDate);
             wrapper.last("limit 1");
-            String uscUnitName = constructionInfoMapper.selectOne(wrapper).getUscUnitName();
-            if (StringUtils.isNotEmpty(uscUnitName)){
-                formData.put("uscUnitName",uscUnitName);
+            ConstructionInfo constructionInfo = constructionInfoMapper.selectOne(wrapper);
+            if (Objects.nonNull(constructionInfo) && StringUtils.isNotEmpty(constructionInfo.getUscUnitName())){
+                formData.put("uscUnitName",constructionInfo.getUscUnitName());
             }
         }
         if (formData.containsKey("useUnitCreditCode")  ){