Skip to content

A
amos-boot-biz
Commit 6f6f367b authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

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

parents d4477419 abb1e9bf
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
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
View file @ 6f6f367b
...@@ -2328,9 +2328,9 @@ public class CommonServiceImpl implements ICommonService { ...@@ -2328,9 +2328,9 @@ public class CommonServiceImpl implements ICommonService {
wrapper.eq(AbstractEquipBaseEntity::getRecord,formData.getString("equipId")); wrapper.eq(AbstractEquipBaseEntity::getRecord,formData.getString("equipId"));
wrapper.orderByDesc(AbstractEquipBaseEntity::getRecDate); wrapper.orderByDesc(AbstractEquipBaseEntity::getRecDate);
wrapper.last("limit 1"); wrapper.last("limit 1");
String uscUnitName = constructionInfoMapper.selectOne(wrapper).getUscUnitName(); ConstructionInfo constructionInfo = constructionInfoMapper.selectOne(wrapper);
if (StringUtils.isNotEmpty(uscUnitName)){ if (Objects.nonNull(constructionInfo) && StringUtils.isNotEmpty(constructionInfo.getUscUnitName())){
formData.put("uscUnitName",uscUnitName); formData.put("uscUnitName",constructionInfo.getUscUnitName());
} }
} }
if (formData.containsKey("useUnitCreditCode") ){ if (formData.containsKey("useUnitCreditCode") ){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment