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

# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao">
+    <insert id="batchInsert">
+        insert into sar_stand_project_relation(project_id,stand_id) VALUES
+        <foreach collection="list" item="list" separator=",">
+            (#{list.projectId,jdbcType=VARCHAR},#{list.standId,jdbcType=VARCHAR})
+        </foreach>
+    </insert>
 
 
     <select id="queryProjectManagerPage" resultType="com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary">
@@ -11,4 +17,12 @@
         GROUP BY s.product_line
         limit #{current},#{pageSize}
     </select>
+
+    <delete id="deleteByIds">
+        delete from sar_stand_project_relation where stand_id in (
+        <foreach collection="ids" item="list" separator=",">
+            #{list}
+        </foreach>
+        )
+    </delete>
 </mapper>