周洋

fs-service/src/main/resources/mapper/company/CompanyDeptMapper.xml

@@ -164,7 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
         </set>
-        where dept_id in (${ancestors})
+        where find_in_set(dept_id, #{ancestors})
     </update>
 
     <select id="selectChildrenDeptById" resultMap="CompanyDeptResult">

fs-service/src/main/resources/mapper/company/CompanyTagMapper.xml

@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ctu.user_id = #{userId}
     </select>
     <select id="findUserTagByUserId" resultType="java.lang.String">
-        select tag_ids from company_tag_user where user_id = ${userId} and company_user_id=${companyUserId} limit 1
+        select tag_ids from company_tag_user where user_id = #{userId} and company_user_id=#{companyUserId} limit 1
     </select>
     <resultMap id="companyTagMap" type="com.fs.company.domain.CompanyTag">
         <id column="tag_id" property="tagId" jdbcType="BIGINT" javaType="java.lang.Long"/>

fs-service/src/main/resources/mapper/company/CompanyUserMapper.xml

@@ -288,7 +288,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </insert>
     <update id="uploadQrCode">
-        update company_user set qr_code_weixin=#{url} where user_id=${userId}
+        update company_user set qr_code_weixin=#{url} where user_id=#{userId}
     </update>
     <update id="updateCompanyUser">
         update company_user
@@ -587,7 +587,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND company_user_id = #{companyUserId}
             </if>
             <if test="previousDay != null">
-                and camp_period_time = ${previousDay}
+                and camp_period_time = #{previousDay}
             </if>
         </where>
     </select>
@@ -599,7 +599,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND company_user_id = #{companyUserId}
             </if>
             <if test="previousDay != null">
-                and camp_period_time = ${previousDay}
+                and camp_period_time = #{previousDay}
             </if>
         </where>
     </select>
@@ -611,7 +611,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND company_user_id = #{companyUserId}
             </if>
             <if test="previousDay != null">
-                and camp_period_time = ${previousDay}
+                and camp_period_time = #{previousDay}
             </if>
         </where>
     </select>

fs-service/src/main/resources/mapper/course/FsCourseTrafficLogMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             create_time >= CURDATE()
             AND create_time < CURDATE() + INTERVAL 1 DAY
             <if test="companyId != null">
-                AND company_id = ${companyId}
+                AND company_id = #{companyId}
             </if>
         </where>
     </select>
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             create_time  &gt;= CURDATE() - INTERVAL 1 DAY
             AND create_time &lt; CURDATE()
             <if test="companyId != null">
-                AND company_id = ${companyId}
+                AND company_id = #{companyId}
             </if>
         </where>
     </select>
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             create_time >= DATE_FORMAT(CURDATE(), '%Y-%m-01')
             AND create_time &lt; DATE_FORMAT(CURDATE() + INTERVAL 1 MONTH, '%Y-%m-01')
             <if test="companyId != null">
-                AND company_id = ${companyId}
+                AND company_id = #{companyId}
             </if>
         </where>
     </select>
@@ -259,10 +259,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and company_id = #{companyId}
             </if>
             <if test="courseId != null">
-                and course_id = ${courseId}
+                and course_id = #{courseId}
             </if>
             <if test="project != null">
-                and project = ${project}
+                and project = #{project}
             </if>
             <if test="common == null">
                 AND company_id IS not NULL

fs-service/src/main/resources/mapper/course/FsUserCourseTrainingCampMapper.xml

@@ -37,7 +37,7 @@
         <choose>
             <when test="params.scs != null and params.scs.size() > 0">
                 <foreach collection="params.scs" item="sc" separator=",">
-                    ${sc.column} ${sc.order}
+                    <choose><when test="sc.column == 'order_number'">order_number</when><when test="sc.column == 'training_camp_name'">training_camp_name</when><when test="sc.column == 'training_camp_id'">training_camp_id</when><otherwise>training_camp_id</otherwise></choose> <choose><when test="sc.order == 'ASC'">ASC</when><otherwise>DESC</otherwise></choose>
                 </foreach>
             </when>
             <otherwise>

fs-service/src/main/resources/mapper/his/FsPackageOrderMapper.xml

@@ -318,7 +318,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where O.is_pay = 1 ORDER BY RAND() desc LIMIT 20
     </select>
     <select id="selectOutTimeOrderList" resultType="com.fs.his.domain.FsPackageOrder">
-        select * from fs_package_order  where status = 1 AND NOW() &gt; DATE_ADD(create_time, INTERVAL ${unPayTime} MINUTE)
+        select * from fs_package_order  where status = 1 AND NOW() &gt; DATE_ADD(create_time, INTERVAL #{unPayTime} MINUTE)
     </select>
     <select id="selectInformationCollectionByStoreOrderId" resultType="com.fs.his.vo.FsUserInfoCollectionAndStoreOrderVo">
         SELECT ic.* FROM `fs_package_order` po

fs-service/src/main/resources/mapper/his/FsStoreOrderMapper.xml

@@ -953,7 +953,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             so.pay_money
         </if>
         <if test="maps.sortOrder != null and maps.sortOrder != ''">
-            ${maps.sortOrder}
+            <choose><when test="maps.sortOrder == 'ASC'">ASC</when><otherwise>DESC</otherwise></choose>
         </if>
         <if test="maps.sortField == null or maps.sortField == ''">
             so.order_id desc
@@ -1177,7 +1177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             so.pay_money
         </if>
         <if test="maps.sortOrder != null and maps.sortOrder != ''">
-            ${maps.sortOrder}
+            <choose><when test="maps.sortOrder == 'ASC'">ASC</when><otherwise>DESC</otherwise></choose>
         </if>
         <if test="maps.sortField == null or maps.sortField == ''">
             so.order_id desc
@@ -1656,7 +1656,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             so.pay_money
         </if>
         <if test="maps.sortOrder != null and maps.sortOrder != ''">
-            ${maps.sortOrder}
+            <choose><when test="maps.sortOrder == 'ASC'">ASC</when><otherwise>DESC</otherwise></choose>
         </if>
         <if test="maps.sortField == null or maps.sortField == ''">
             so.order_id desc
@@ -2153,7 +2153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectOutTimeOrderList" resultType="com.fs.his.domain.FsStoreOrder">
         <include refid="selectFsStoreOrderVo"/>
-        where is_del = 0 and status = 1 and NOW() &gt; DATE_ADD(create_time, INTERVAL ${unPayTime} MINUTE)
+        where is_del = 0 and status = 1 and NOW() &gt; DATE_ADD(create_time, INTERVAL #{unPayTime} MINUTE)
     </select>
 
 </mapper>

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -392,7 +392,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyUserIds != null and companyUserIds.size > 0">
                 AND ucu.company_user_id in
                 <foreach collection="companyUserIds" item="item" index="index" open="(" separator="," close=")">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="nickname != null and nickname != ''">
@@ -434,7 +434,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyUserIds != null and companyUserIds.size > 0">
                 AND ucu.company_user_id in
                 <foreach collection="companyUserIds" item="item" index="index" open="(" separator="," close=")">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="nickname != null and nickname!=''">
@@ -454,7 +454,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where
         user_id in
         <foreach collection="userIds" open="(" close=")" separator="," item="item">
-            ${item}
+            #{item}
         </foreach>
     </update>
 

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -1268,7 +1268,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             o.pay_money
         </if>
         <if test="maps.sortOrder != null and maps.sortOrder != ''">
-            ${maps.sortOrder}
+            <choose><when test="maps.sortOrder == 'ASC'">ASC</when><otherwise>DESC</otherwise></choose>
         </if>
         <if test="maps.sortField == null or maps.sortField == ''">
             o.id desc
@@ -1888,7 +1888,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             o.pay_money
         </if>
         <if test="maps.sortOrder != null and maps.sortOrder != ''">
-            ${maps.sortOrder}
+            <choose><when test="maps.sortOrder == 'ASC'">ASC</when><otherwise>DESC</otherwise></choose>
         </if>
         <if test="maps.sortField == null or maps.sortField == ''">
             o.id desc

fs-service/src/main/resources/mapper/hisStore/FsUserCourseCountScrmMapper.xml

@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ifnull ( sum( fs_user_course_count.part_course_count ), 0 ) AS part_course_count,
             Max( fs_user_course_count.last_watch_date ) AS last_watch_date,
             Max( fs_user_course_count.complete_watch_date) AS complete_watch_date
-            from fs_user_course_count where user_id = ${userId}
+            from fs_user_course_count where user_id = #{userId}
     </select>
 
     <insert id="insertFsUserCourseCount">

fs-service/src/main/resources/mapper/hisStore/FsUserScrmMapper.xml

@@ -577,7 +577,7 @@
         where
             user_id in
         <foreach collection="userIds" open="(" close=")" separator="," item="item">
-            ${item}
+            #{item}
         </foreach>
     </update>
 
@@ -628,7 +628,7 @@
             <if test="companyUserIds != null and companyUserIds.size > 0">
                 AND ucu.company_user_id in
                 <foreach collection="companyUserIds" item="item" index="index" open="(" separator="," close=")">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="nickname != null and nickname != ''">
@@ -1695,7 +1695,7 @@
             <if test="companyUserIds != null and companyUserIds.size > 0">
                 AND ucu.company_user_id in
                 <foreach collection="companyUserIds" item="item" index="index" open="(" separator="," close=")">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="nickname != null and nickname!=''">

fs-service/src/main/resources/mapper/live/LiveDataMapper.xml

@@ -139,7 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 END AS date_range,
         <choose>
             <when test="category == 'streams'"> COUNT(l.live_id) </when>
-            <otherwise> SUM(ld.${category}) </otherwise>
+            <otherwise> SUM(ld.<choose><when test="category == 'views'">views</when><when test="category == 'likes'">likes</when><when test="category == 'comments'">comments</when><when test="category == 'shares'">shares</when><otherwise>views</otherwise></choose>) </otherwise>
         </choose>
          AS views
             FROM live_data ld
@@ -189,7 +189,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 END AS date_range,
         <choose>
             <when test="category == 'streams'"> COUNT(l.live_id) </when>
-            <otherwise> SUM(ld.${category}) </otherwise>
+            <otherwise> SUM(ld.<choose><when test="category == 'views'">views</when><when test="category == 'likes'">likes</when><when test="category == 'comments'">comments</when><when test="category == 'shares'">shares</when><otherwise>views</otherwise></choose>) </otherwise>
         </choose>
          AS views
             FROM live_data ld

fs-service/src/main/resources/mapper/live/LiveOrderMapper.xml

@@ -814,7 +814,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         o.pay_money
     </if>
     <if test="maps.sortOrder != null and maps.sortOrder != ''">
-        ${maps.sortOrder}
+        <choose><when test="maps.sortOrder == 'ASC'">ASC</when><otherwise>DESC</otherwise></choose>
     </if>
     <if test="maps.sortField == null or maps.sortField == ''">
         o.order_id desc

fs-service/src/main/resources/mapper/qw/QwWatchLogMapper.xml

@@ -107,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyUserIds != null and companyUserIds.size() != 0">
                 and company_user_id in
                 <foreach collection="companyUserIds" item="item" open="(" close=")" separator=",">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="project != null">
@@ -131,7 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyUserIds != null">
                 and company_user_id in
                 <foreach collection="companyUserIds" item="item" open="(" close=")" separator=",">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="project != null">
@@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyUserIds != null and companyUserIds.size() != 0">
                 and company_user_id in
                 <foreach collection="companyUserIds" item="item" open="(" close=")" separator=",">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="project != null">

fs-service/src/main/resources/mapper/sop/QwSopMapper.xml

@@ -467,7 +467,7 @@
             ]]>
             </if>
             <if test="companyId != null">
-                AND qw_sop.company_id = ${companyId}
+                AND qw_sop.company_id = #{companyId}
             </if>
         </where>
         ORDER BY qw_sop.create_time DESC

fs-service/src/main/resources/mapper/statis/ConsumptionBalanceMapper.xml

@@ -42,13 +42,13 @@
         select count(log_id) from fs_course_watch_log
         <where>
             <if test="userType != null">
-                and send_type=${userType}
+                and send_type=#{userType}
             </if>
             <if test="startTime != null and endTime != null">
                 and create_time between #{startTime} and #{endTime}
             </if>
             <if test="companyId != null">
-                and company_id = #{companyId}
+                AND company_id = #{companyId}
             </if>
         </where>
     </select>
@@ -57,13 +57,13 @@
         <where>
             finish_time is not null
             <if test="userType != null">
-                and send_type=${userType}
+                and send_type=#{userType}
             </if>
             <if test="startTime != null and endTime != null">
                 and create_time between #{startTime} and #{endTime}
             </if>
             <if test="companyId != null">
-                and company_id = #{companyId}
+                AND company_id = #{companyId}
             </if>
         </where>
     </select>
@@ -71,13 +71,13 @@
         select count(distinct user_id) from fs_course_watch_log
         <where>
             <if test="userType != null">
-                and send_type=${userType}
+                and send_type=#{userType}
             </if>
             <if test="startTime != null and endTime != null">
                 and create_time between #{startTime} and #{endTime}
             </if>
             <if test="companyId != null">
-                and company_id = #{companyId}
+                AND company_id = #{companyId}
             </if>
 
         </where>
@@ -90,10 +90,10 @@
                  AND create_time BETWEEN #{startTime} AND #{endTime}
              </if>
              <if test="userType != null">
-                 and send_type=${userType}
+                 and send_type=#{userType}
              </if>
              <if test="companyId != null">
-                 and company_id = #{companyId}
+                 AND company_id = #{companyId}
              </if>
          </where>
     </select>
@@ -104,7 +104,7 @@
                create_time BETWEEN #{startTime} AND #{endTime}
            </if>
            <if test="companyId != null">
-               and company_id = #{companyId}
+               AND company_id = #{companyId}
            </if>
        </where>
     </select>
@@ -116,7 +116,7 @@
                 and create_time BETWEEN #{startTime} AND #{endTime}
             </if>
             <if test="companyId != null">
-                and company_id = #{companyId}
+                AND company_id = #{companyId}
             </if>
         </where>
     </select>
@@ -129,7 +129,7 @@
                 and rpl.create_time BETWEEN #{startTime} AND #{endTime}
             </if>
             <if test="userType != null">
-                and log.send_type = ${userType}
+                and log.send_type = #{userType}
             </if>
             <if test="companyId != null">
                 and log.company_id = #{companyId}
@@ -145,7 +145,7 @@
                 and rpl.create_time BETWEEN #{startTime} AND #{endTime}
             </if>
             <if test="userType != null">
-                and log.send_type = ${userType}
+                and log.send_type = #{userType}
             </if>
             <if test="companyId != null">
                 and log.company_id = #{companyId}
@@ -190,7 +190,7 @@
                 AND create_time <![CDATA[<]]> #{endTime}
             </if>
             <if test="userType != null">
-                AND send_type = ${userType}
+                AND send_type = #{userType}
             </if>
         </where>
         GROUP BY
@@ -220,10 +220,10 @@
                 AND create_time <![CDATA[<]]> #{endTime}
             </if>
             <if test="userType != null">
-                AND send_type = ${userType}
+                AND send_type = #{userType}
             </if>
             <if test="companyId != null">
-                AND company_id = ${companyId}
+                AND company_id = #{companyId}
             </if>
         </where>
         GROUP BY company_id
@@ -423,10 +423,10 @@
                 AND rpl.create_time <![CDATA[<]]> #{endTime}
             </if>
             <if test="userType != null">
-                and log.send_type = ${userType}
+                and log.send_type = #{userType}
             </if>
             <if test="companyId != null">
-                and log.company_id = ${companyId}
+                and log.company_id = #{companyId}
             </if>
         </where>
         GROUP BY
@@ -462,10 +462,10 @@
                 AND rpl.create_time <![CDATA[<]]> #{endTime}
             </if>
             <if test="userType != null">
-                and log.send_type = ${userType}
+                and log.send_type = #{userType}
             </if>
             <if test="companyId != null">
-                and log.company_id = ${companyId}
+                and log.company_id = #{companyId}
             </if>
         </where>
         group by start_date
@@ -509,7 +509,7 @@
                 (select COUNT(*) FROM qw_user
                 <where>
                     <if test="companyId != null">
-                       AND company_id = ${companyId}
+                       AND company_id = #{companyId}
                     </if>
                 </where>
         ) AS qw_member_num

fs-service/src/main/resources/mapper/statis/FsStatisEveryDayMapper.xml

@@ -144,13 +144,13 @@
             <if test="userIds != null and userIds.length > 0">
                 AND company_user_id IN
                 <foreach collection="userIds" open="(" close=")" separator="," item="item">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="periodList != null and periodList.length > 0">
                 AND period_id IN
                 <foreach collection="periodList" open="(" close=")" separator="," item="item">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="startDate != null and endDate != null">

fs-service/src/main/resources/mapper/statis/FsStatisPeriodWatchMapper.xml

@@ -42,13 +42,13 @@
             <if test="userIds != null and userIds.length > 0">
                 AND company_user_id IN
                 <foreach collection="userIds" open="(" close=")" separator="," item="item">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="periodList != null and periodList.length > 0">
                 AND period_id IN
                 <foreach collection="periodList" open="(" close=")" separator="," item="item">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="startDate != null and endDate != null">

fs-service/src/main/resources/mapper/statis/FsStatisSalerWatchMapper.xml

@@ -59,7 +59,7 @@
             <if test="userIds != null and userIds.size() > 0">
                 AND company_user_id IN
                 <foreach collection="userIds" open="(" close=")" separator="," item="item">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="periodList != null and periodList.size() > 0">
@@ -117,7 +117,7 @@
             <if test="userIds != null and userIds.size() > 0">
                 AND company_user_id IN
                 <foreach collection="userIds" open="(" close=")" separator="," item="item">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="periodList != null and periodList.size() > 0">
@@ -166,7 +166,7 @@
             <if test="userIds != null and userIds.size() > 0">
                 AND company_user_id IN
                 <foreach collection="userIds" open="(" close=")" separator="," item="item">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="periodList != null and periodList.size() > 0">
@@ -226,7 +226,7 @@
             <if test="userIds != null and userIds.size() > 0">
                 AND watch.company_user_id IN
                 <foreach collection="userIds" open="(" close=")" separator="," item="item">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="periodList != null and periodList.size() > 0">
@@ -353,7 +353,7 @@
             <if test="userIds != null and userIds.size() > 0">
                 AND company_user_id IN
                 <foreach collection="userIds" open="(" close=")" separator="," item="item">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="periodList != null and periodList.size() > 0">
@@ -402,7 +402,7 @@
             <if test="userIds != null and userIds.size() > 0">
                 AND company_user_id IN
                 <foreach collection="userIds" open="(" close=")" separator="," item="item">
-                    ${item}
+                    #{item}
                 </foreach>
             </if>
             <if test="periodList != null and periodList.size() > 0">

fs-service/src/main/resources/mapper/store/FsUserCourseCountMapper.xml

@@ -63,7 +63,7 @@
             ifnull ( sum( fs_user_course_count.part_course_count ), 0 ) AS part_course_count,
             Max( fs_user_course_count.last_watch_date ) AS last_watch_date,
             Max( fs_user_course_count.complete_watch_date) AS complete_watch_date
-        from fs_user_course_count where user_id = ${userId}
+        from fs_user_course_count where user_id = #{userId}
     </select>
 
     <insert id="insertFsUserCourseCount">