Merge remote-tracking branch 'origin/master'

Alan

2021-02-21 67aafeb142cf9af2a5dbcd1d17a450f31e2751b3

 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/mapper/EmpContractInfoMapper.java

@@ -39,4 +39,25 @@
    "        </foreach>\n" +
    "</script>")
void logicDeleteByIds(@Param("list") List<String> list,@Param("operatorId") String operatorId);
    /**
     *
     * 暂存记录提交
     *
     * date luoyibo
     * @author: 2021-01-31 11:28:23
     * @param list 待删除Id
     * @param operatorId 操作员Id
     * @return void
     */
    @Update("<script> " +
            " UPDATE t_emp_contractinfo SET delFlag = 0,\n" +
            " modifyTime = NOW(),\n" +
            " modifier = #{operatorId}, \n" +
            " version = version+1 \n" +
            " WHERE contractId IN \n" +
            "        <foreach item=\"delId\" collection=\"list\" open=\"(\" close=\")\" separator=\",\">\n" +
            "            #{delId} \n" +
            "        </foreach>\n" +
            "</script>")
    int momentToNormal(@Param("list") List<String> list,@Param("operatorId") String operatorId);
}