解决冲突

picc-common/src/main/resources/mapper/business/InsuranceApplication.xml

@@ -145,22 +145,25 @@
 id_,company_id,definition_id,insured_name,insured_tel,company_name,uscc_code,business_scope,industry_type,employees_number,insured_number,company_address,loss_in_recent_years,start_time,end_time,insurance_fee,status_,process_status,create_by,create_time,update_by,update_time,del_flag		from business_insurance_application where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
-		select count(*) from business_insurance_application where id_=#{0}
+		select count(*) from business_insurance_application where id_=#{0} and del_flag = false
 	</select>
 	<select id="list" resultMap="InsuranceApplicationMap">
-		select * from business_insurance_application
+		select * from business_insurance_application where del_flag = false
 	</select>
 	<select id="search" parameterType="hashmap" resultMap="InsuranceApplicationMap">
 		<![CDATA[
 			select * from business_insurance_application
 		]]>
 		<where>
-			<if test="searchParams.id != null">
-				and ID_ like #{searchParams.id}
-			</if>
-			<if test="searchParams.status != null">
-				and status_ like #{searchParams.status}
-			</if>
+            <if test="searchParams.id != null">
+                and ID_ like #{searchParams.id}
+            </if>
+            <if test="searchParams.companyId != null">
+                and company_id like #{searchParams.companyId}
+            </if>
+            <if test="searchParams.status != null">
+                and status_ like #{searchParams.status}
+            </if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}