lihongjie/coal
1
0
Fork 0
mirror of https://codeup.aliyun.com/64f7d6b8ce01efaafef1e678/coal/coal.git synced 2026-01-25 15:55:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

处理空指针问题

Browse Source
This commit is contained in:
lihongjie0209
2024-06-02 14:48:51 +08:00
parent 258a9a92a9
commit 8ef6612a6c
9 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/cn/lihongjie/coal/dictionary/service/DictionaryService.java
View File

@@ -88,8 +88,9 @@ public class DictionaryService extends BaseService<DictionaryEntity, DictionaryR
ScriptExecResultDto result = scriptService.exec(resultDto);
if (StringUtils.isNotEmpty(result.getStackTrace())) {
log.warn(
"执行脚本出错 id:{}\nparams:{}\nstacktrace:{}\nlogs:{}",
"执行脚本出错 id:{} ｛｝ \nparams:{}\nstacktrace:{}\nlogs:{}",
result.getId(),
dict.getScript().getName(),
result.getParams() + "",
result.getStackTrace(),
result.getLogs());

6
src/main/java/cn/lihongjie/coal/weightDeviceData/service/WeightDeviceDataService.java
View File

@@ -455,7 +455,13 @@ where 更新时间>='%s' and 更新时间<='%s'
}
if (CollectionUtils.isNotEmpty(request.getMzUserList())) {
where += " and d.mz_user in :mzUserList ";
}
if (CollectionUtils.isNotEmpty(request.getPzUserList())) {
where += " and d.pz_user in :pzUserList ";
}

2
src/main/resources/scripts/dict/enum/weightDeviceDataGoodsDict.groovy
View File

@@ -13,7 +13,7 @@ EntityManager em = ioc.getBean(EntityManager.class)
return em.createQuery("select distinct goods from WeightDeviceDataEntity where goods like :q and organizationId = :organizationId order by goods limit 10")
.setParameter("q", "%${(params as JsonNode).get("q").asText('')}%" as String)
.setParameter("q", "%${(params as JsonNode).get("q")?.asText('') ?: ''}%" as String)
.setParameter("organizationId", Ctx.currentUser().organizationId)
.resultList
.collect { it as String }

2
src/main/resources/scripts/dict/enum/weightDeviceDataMzUserDict.groovy
View File

@@ -13,7 +13,7 @@ EntityManager em = ioc.getBean(EntityManager.class)
return em.createQuery("select distinct mzUser from WeightDeviceDataEntity where mzUser like :q and organizationId = :organizationId order by mzUser limit 10")
.setParameter("q", "%${(params as JsonNode).get("q").asText('')}%" as String)
.setParameter("q", "%${(params as JsonNode).get("q")?.asText('') ?: ''}%" as String)
.setParameter("organizationId", Ctx.currentUser().organizationId)
.resultList
.collect { it as String }

2
src/main/resources/scripts/dict/enum/weightDeviceDataPlateNoDict.groovy
View File

@@ -13,7 +13,7 @@ EntityManager em = ioc.getBean(EntityManager.class)
return em.createQuery("select distinct plateNo from WeightDeviceDataEntity where plateNo like :q and organizationId = :organizationId order by plateNo limit 10")
.setParameter("q", "%${(params as JsonNode).get("q").asText('')}%" as String)
.setParameter("q", "%${(params as JsonNode).get("q")?.asText('') ?: ''}%" as String)
.setParameter("organizationId", Ctx.currentUser().organizationId)
.resultList
.collect { it as String }

2
src/main/resources/scripts/dict/enum/weightDeviceDataPzUserDict.groovy
View File

@@ -13,7 +13,7 @@ EntityManager em = ioc.getBean(EntityManager.class)
return em.createQuery("select distinct pzUser from WeightDeviceDataEntity where pzUser like :q and organizationId = :organizationId order by pzUser limit 10")
.setParameter("q", "%${(params as JsonNode).get("q").asText('')}%" as String)
.setParameter("q", "%${(params as JsonNode).get("q")?.asText('') ?: ''}%" as String)
.setParameter("organizationId", Ctx.currentUser().organizationId)
.resultList
.collect { it as String }

2
src/main/resources/scripts/dict/enum/weightDeviceDataReceiveOrganizationDict.groovy
View File

@@ -13,7 +13,7 @@ EntityManager em = ioc.getBean(EntityManager.class)
return em.createQuery("select distinct receiveOrganization from WeightDeviceDataEntity where receiveOrganization like :q and organizationId = :organizationId order by receiveOrganization limit 10")
.setParameter("q", "%${(params as JsonNode).get("q").asText('')}%" as String)
.setParameter("q", "%${(params as JsonNode).get("q")?.asText('') ?: ''}%" as String)
.setParameter("organizationId", Ctx.currentUser().organizationId)
.resultList
.collect { it as String }

2
src/main/resources/scripts/dict/enum/weightDeviceDataSendOrganizationDict.groovy
View File

@@ -13,7 +13,7 @@ EntityManager em = ioc.getBean(EntityManager.class)
return em.createQuery("select distinct sendOrganization from WeightDeviceDataEntity where sendOrganization like :q and organizationId = :organizationId order by sendOrganization limit 10")
.setParameter("q", "%${(params as JsonNode).get("q").asText('')}%" as String)
.setParameter("q", "%${(params as JsonNode).get("q")?.asText('') ?: ''}%" as String)
.setParameter("organizationId", Ctx.currentUser().organizationId)
.resultList
.collect { it as String }

2
src/main/resources/scripts/dict/enum/weightDeviceDataSpecificationDict.groovy
View File

@@ -13,7 +13,7 @@ EntityManager em = ioc.getBean(EntityManager.class)
return em.createQuery("select distinct specification from WeightDeviceDataEntity where specification like :q and organizationId = :organizationId order by specification limit 10")
.setParameter("q", "%${(params as JsonNode).get("q").asText('')}%" as String)
.setParameter("q", "%${(params as JsonNode).get("q")?.asText('') ?: ''}%" as String)
.setParameter("organizationId", Ctx.currentUser().organizationId)
.resultList
.collect { it as String }