Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseApplyInfoMapper.xml

@@ -279,6 +279,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select task_id
         from lease_apply_info
         where id = #{parentId}
+        LIMIT 1
     </select>
 
     <update id="updateLeaseApplyInfoSign">
@@ -890,12 +891,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bm_agreement_info
         WHERE
             unit_id = #{leaseUnitId}
+        LIMIT 1
     </select>
 
     <select id="selectUnitTypeByUnitId" resultType="java.lang.Long">
         select type_id as typeId
         from bm_unit
         where unit_id = #{unitId}
+        LIMIT 1
     </select>
 
     <select id="selectProjectUnitAgreementIdByTeamAndProject" resultType="com.bonus.common.biz.domain.lease.LeaseOutDetails">

bonus-modules/bonus-material/src/main/resources/mapper/material/task/TmTaskMapper.xml

@@ -206,6 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bm_unit
         WHERE
             unit_id = #{leaseUnitId}
+        LIMIT 1
     </select>
 
     <select id="selectTmTaskByPreTaskId" parameterType="Long" resultMap="TmTaskResult">