From 8b225fbb1415960cf31d96c72c8514c7f429fbba Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 21 Dec 2021 17:01:48 +0800
Subject: [PATCH 1/2] feat: There is no way the,

---
 .../service/impl/SarStandardsInfoServiceImpl.java           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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<SarStandardsInfoDao
                                 tsUserQW.select("UNAME")
                                         .in("USID",valArr);
                                 List<String> 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<SarStandardsInfoDao
                                 tsPositionQW.select("name")
                                         .in("id",valArr);
                                 List<String> 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);
                     }
                 }
             }

From 22cc39c0e24c224da0946867b14fc0aacea30fa6 Mon Sep 17 00:00:00 2001
From: yuezhihang <yuezhihang@91isoft.com>
Date: Tue, 21 Dec 2021 20:42:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=8F=82=E4=BC=9A=E5=85=A5=E4=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/adc/da/slrs/sapMeetInfo/entity/SapMeeting.java   | 2 ++
 .../resources/mybatis/mapper/sapMeetInfo/SapMeetingMapper.xml | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

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/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 @@
 <mapper namespace="com.adc.da.slrs.sapMeetInfo.dao.SapMeetingDao">
 
     <sql id="BaseSelect">
-        id,title,date,content,type,attend,files
+        id,title,date,content,type,attend,files,place
     </sql>
     <sql id="Search">
         type = #{type}
@@ -19,6 +19,7 @@
             <if test="type != null">type,</if>
             <if test="attend != null">attend,</if>
             <if test="files != null">files,</if>
+            <if test="place != null">place,</if>
         </trim>
         values
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -29,6 +30,7 @@
             <if test="type != null">#{type},</if>
             <if test="attend != null">#{attend},</if>
             <if test="files != null">#{files},</if>
+            <if test="place != null">#{place},</if>
         </trim>
     </insert>