Merge branch 'develop' of http://192.168.9.26/platform/finance_serv into develop

code/finance_serv/src/main/java/com/vion/financial/mapping/ContractMapper.xml

@@ -298,7 +298,7 @@
 		where contract_unid=#{contract_unid}
 	</update>
 	<delete id="deleteOne" parameterType="java.lang.String">
-		update tb_contract set is_delete = false where contract_unid = #{contract_unid}
+		update tb_contract set is_delete = true where contract_unid = #{contract_unid}
 		<!-- delete from tb_contract where contract_unid = #{contract_unid} -->
 	</delete>
 	
@@ -688,7 +688,10 @@
 		select is_delete from tb_contract where contract_unid = #{contract_unid}
 	</select>
 	<select id="queryList" resultType="String">
-		select contract_unid from tb_contract
+		select contract_unid from tb_contract where
+		   is_delete=false
+		   and project_unid is not null
+		   and customer_unid is not null 
 	</select>
 	<select id="countNumber" resultType="int">
 		select count(contract_unid) from tb_contract where is_delete=false