diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index c4a0878c..95671ab9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -613,7 +613,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl stringList = tsUserService.listObjs(tsUserQW, o ->o.toString()); - value= String.join(",", stringList); + value= String.join(",", stringList.isEmpty() ? valArr : stringList); break; } //通过id绑定责任部门师名称 @@ -622,14 +622,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl stringList = iTsPositionService.listObjs(tsPositionQW, o -> o.toString()); - value = String.join(",", stringList); + value= String.join(",", stringList.isEmpty() ? valArr : stringList); break; } default:value = dicTypeEODao.getDicNamesByCodes(valArr); } - entry.setValue(value); + entry.setValue(value == null ? String.join(",",valArr) : value); } } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml index 6c9f406d..459621b6 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml @@ -95,7 +95,8 @@ and SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{lawsNumber}),'%') - and (LAWS_NAME like concat(concat('%',#{numberName}),'%') + and (SAR_LAWS_STAND_INFO.LAWS_NAME like concat(concat('%',#{numberName}),'%') + or SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{numberName}),'%') or SAR_LAWS_STAND_INFO.LAWS_EN_NAME like concat(concat('%',#{numberName}),'%'))