Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
sk1551 2020-09-09 14:45:20 +08:00
commit 5dfecece30
3 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/views/benyi/thememonthplan/table.vue
View File

@ -188,6 +188,7 @@ export default {
getList() { getList() {
//console.log(this.queryParams.wpid); //console.log(this.queryParams.wpid);
listMonthplanitem(this.queryParams).then((response) => { listMonthplanitem(this.queryParams).then((response) => {
if (response.rows.length > 0) {
this.bodyData.monthplanitemList = response.rows; this.bodyData.monthplanitemList = response.rows;
//获取所有的活动id //获取所有的活动id
@ -209,6 +210,9 @@ export default {
} }
this.bodyData.monthplanitemList[0].theme = activityIds; this.bodyData.monthplanitemList[0].theme = activityIds;
}else{
this.bodyData.monthplanitemList[0].theme = " ";
}
}); });
}, },
// 主题--字典状态字典翻译 // 主题--字典状态字典翻译

2
ruoyi-ui/src/views/benyi/themetermplan/table.vue
View File

@ -108,7 +108,7 @@ export default {
}, },
// 主题--字典状态字典翻译 // 主题--字典状态字典翻译
themeFormat(themeids) { themeFormat(themeids) {
if (themeids != "") { if (themeids != "" && themeids != null) {
var ilength = themeids.split(";").length - 1; var ilength = themeids.split(";").length - 1;
var names = ""; var names = "";
for (var i = 1; i < ilength; i++) { for (var i = 1; i < ilength; i++) {

2
ruoyi/src/main/resources/mybatis/benyi/ByThemeWeekplanMapper.xml
View File

@ -40,7 +40,7 @@
<if test="createuserid != null ">and createuserid = #{createuserid}</if> <if test="createuserid != null ">and createuserid = #{createuserid}</if>
<if test="xnxq != null and xnxq != ''">and xnxq = #{xnxq}</if> <if test="xnxq != null and xnxq != ''">and xnxq = #{xnxq}</if>
</where> </where>
order by month desc order by month,zc desc
</select> </select>
<select id="selectByThemeWeekplanById" parameterType="String" resultMap="ByThemeWeekplanResult"> <select id="selectByThemeWeekplanById" parameterType="String" resultMap="ByThemeWeekplanResult">