diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java index 1568a4f6..e0a9816a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java @@ -45,5 +45,7 @@ public class SapMeeting{ private String files;//附件 json + private String place; + } 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/sapMeetInfo/SapMeetingMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml index 533cc110..eb04e434 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml @@ -3,7 +3,7 @@ - id,title,date,content,type,attend,files + id,title,date,content,type,attend,files,place type = #{type} @@ -19,6 +19,7 @@ type, attend, files, + place, values @@ -29,6 +30,7 @@ #{type}, #{attend}, #{files}, + #{place},