Commit 7c2cec61 authored by zhangsen's avatar zhangsen

移装告知详情查询bug

parent 365b8224
...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl; ...@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...@@ -125,11 +126,11 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto ...@@ -125,11 +126,11 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
for (String s : fields) { for (String s : fields) {
if (transferNotice.containsKey(s)) { if (transferNotice.containsKey(s)) {
if ("powerOfAttorney".equalsIgnoreCase(s)) { if ("powerOfAttorney".equalsIgnoreCase(s)) {
transferNotice.put("powerOfAttorneyList", JSON.parseArray(transferNotice.get(s).toString())); transferNotice.put("powerOfAttorneyList", ObjectUtils.isEmpty(transferNotice.get(s)) ? new JSONArray() : JSON.parseArray(transferNotice.get(s).toString()));
} else if ("constructionContract".equalsIgnoreCase(s)) { } else if ("constructionContract".equalsIgnoreCase(s)) {
transferNotice.put("constructionContractList", JSON.parseArray(transferNotice.get(s).toString())); transferNotice.put("constructionContractList", ObjectUtils.isEmpty(transferNotice.get(s)) ? new JSONArray() : JSON.parseArray(transferNotice.get(s).toString()));
} else { } else {
transferNotice.put(s, JSON.parseArray(transferNotice.get(s).toString())); transferNotice.put(s, ObjectUtils.isEmpty(transferNotice.get(s)) ? new JSONArray() : JSON.parseArray(transferNotice.get(s).toString()));
} }
} }
if (equipmentInfos.get(0).containsKey(s)) { if (equipmentInfos.get(0).containsKey(s)) {
......
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