Commit e4168d68 authored by tangwei's avatar tangwei

修改bug

parent d256d797
...@@ -160,7 +160,9 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da ...@@ -160,7 +160,9 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<DataDictionary>(); LambdaQueryWrapper<DataDictionary> wrapper = new LambdaQueryWrapper<DataDictionary>();
wrapper.eq(DataDictionary::getIsDelete, false); wrapper.eq(DataDictionary::getIsDelete, false);
wrapper.eq(DataDictionary::getType, type); wrapper.eq(DataDictionary::getType, type);
wrapper.eq(DataDictionary::getParent, parent); if(parent!=null){
wrapper.eq(DataDictionary::getParent, parent);
}
return this.baseMapper.selectList(wrapper); return this.baseMapper.selectList(wrapper);
} }
} }
...@@ -167,7 +167,7 @@ public class FireExpertsController extends BaseController { ...@@ -167,7 +167,7 @@ public class FireExpertsController extends BaseController {
String expertCode = fireExpertsDto.getExpertCode(); String expertCode = fireExpertsDto.getExpertCode();
List<String> expertCodeArr = new ArrayList<String>(); List<String> expertCodeArr = new ArrayList<String>();
expertCodeArr.add(expertCode); expertCodeArr.add(expertCode);
List<DataDictionary> detaList = dataDictionaryService.getAllChildNodes("ZJLY", Long.parseLong(fireExpertsDto.getExpertCode())); List<DataDictionary> detaList = dataDictionaryService.getAllChildNodes("ZJLY", fireExpertsDto.getExpertCode()!=null?Long.parseLong(fireExpertsDto.getExpertCode()):null);
if(detaList!=null && detaList.size()>0 ) { if(detaList!=null && detaList.size()>0 ) {
for (DataDictionary i : detaList) { for (DataDictionary i : detaList) {
......
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