Merge remote-tracking branch 'origin/MVP1.5.5' into MVP1.5.5

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TWorkHandlerInfoMapper.xml

@@ -73,7 +73,7 @@
                         AND a.DEPART_NAME = #{tWorkHandlerInfo.departName}
                     </if>
                     <if test="tWorkHandlerInfo.empName != null and tWorkHandlerInfo.empName.trim() != ''">
-                        AND a.EMP_NAME = like concat('%', #{tWorkHandlerInfo.empName} ,'%')
+                        AND a.EMP_NAME like concat('%', #{tWorkHandlerInfo.empName} ,'%')
                     </if>
                     <if test="tWorkHandlerInfo.empIdcard != null and tWorkHandlerInfo.empIdcard.trim() != ''">
                         AND a.EMP_IDCARD like concat('%', #{tWorkHandlerInfo.empIdcard} ,'%')

yifu-social/yifu-social-biz/src/main/resources/mapper/TPreDispatchInfoMapper.xml

@@ -606,6 +606,9 @@
 			<if test="changeContractAndEmployee != null">
 				CHANGE_CONTRACT_AND_EMPLOYEE = #{changeContractAndEmployee},
 			</if>
+			<if test="contractStartAdd != null">
+				CONTRACT_START_ADD = #{contractStartAdd},
+			</if>
 			<if test="contractEndAdd != null">
 				contract_end_add = #{contractEndAdd},
 			</if>