Merge remote-tracking branch 'origin/develop' into develop

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java

@@ -47,6 +47,12 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "项目编码")
     private String deptNo;
 
+	/**
+	 * 项目id
+	 */
+	@Schema(description = "项目id")
+	private String deptId;
+
 	/**
 	 * 投保岗位
 	 */

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml

@@ -56,6 +56,7 @@
 			<result property="orderNo" column="ORDER_NO" jdbcType="VARCHAR"/>
 			<result property="createUserDeptId" column="CREATE_USER_DEPT_ID" jdbcType="VARCHAR"/>
 			<result property="createUserDeptName" column="CREATE_USER_DEPT_NAME" jdbcType="VARCHAR"/>
+			<result property="deptId" column="DEPT_ID" jdbcType="VARCHAR"/>
 	</resultMap>
     <sql id="Base_Column_List">
         ID,EMP_NAME,
@@ -135,6 +136,9 @@
 		<if test="param.startDate != null and param.startDate.trim() != '' and param.endDate != null and param.endDate.trim() != ''">
 			and detail.CREATE_TIME <![CDATA[ >= ]]>  concat(#{param.startDate}, ' 00:00:00') and detail.CREATE_TIME <![CDATA[ <= ]]> concat(#{param.endDate}, ' 23:59:59')
 		</if>
+		<if test="param.authSql != null and param.authSql.trim() != ''">
+			${tEmployeeInfo.authSql}
+		</if>
 		ORDER BY detail.BUY_HANDLE_STATUS,detail.CREATE_TIME DESC
 	</select>
 	<!--投保不分页查询-->