FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
yuezhihang
2021-12-21 20:42:18 +08:00
parent 22cc39c0e2 223008e42b
commit 5e1df05c6b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+3 -3
View File
@@ -613,7 +613,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
tsUserQW.select("UNAME") tsUserQW.select("UNAME")
.in("USID",valArr); .in("USID",valArr);
List<String> stringList = tsUserService.listObjs(tsUserQW, o ->o.toString()); List<String> stringList = tsUserService.listObjs(tsUserQW, o ->o.toString());
value= String.join(",", stringList); value= String.join(",", stringList.isEmpty() ? valArr : stringList);
break; break;
} }
//通过id绑定责任部门师名称 //通过id绑定责任部门师名称
@@ -622,14 +622,14 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
tsPositionQW.select("name") tsPositionQW.select("name")
.in("id",valArr); .in("id",valArr);
List<String> stringList = iTsPositionService.listObjs(tsPositionQW, o -> o.toString()); List<String> stringList = iTsPositionService.listObjs(tsPositionQW, o -> o.toString());
value = String.join(",", stringList); value= String.join(",", stringList.isEmpty() ? valArr : stringList);
break; break;
} }
default:value = dicTypeEODao.getDicNamesByCodes(valArr); default:value = dicTypeEODao.getDicNamesByCodes(valArr);
} }
entry.setValue(value); entry.setValue(value == null ? String.join(",",valArr) : value);
} }
} }
} }
adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsStandInfo/SarLawsStandInfoMapper.xml
+2 -1
View File
@@ -95,7 +95,8 @@
and SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{lawsNumber}),'%') and SAR_LAWS_STAND_INFO.LAWS_NUMBER like concat(concat('%',#{lawsNumber}),'%')
</if> </if>
<if test="numberName != null and numberName != ''"> <if test="numberName != null and numberName != ''">
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}),'%')) or SAR_LAWS_STAND_INFO.LAWS_EN_NAME like concat(concat('%',#{numberName}),'%'))
</if> </if>
<if test="lawsName != null and lawsName != ''"> <if test="lawsName != null and lawsName != ''">