Browse Source

Accept Merge Request #141 v1.0.26 debug : (master -> test)

Merge Request: v1.0.26 debug
Created By: @Antiloveg
Accepted By: @Antiloveg
URL: https://coding.net/t/aft/p/AFT/git/merge/141
Antiloveg 8 years ago
parent
commit
63dbbe2285
1 changed files with 4 additions and 4 deletions
  1. 4 4
      src/main/java/com/goafanti/common/mapper/ContractMapper.xml

+ 4 - 4
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -405,14 +405,14 @@
   <select id="selectContractSerialNumber" resultType="com.goafanti.contract.bo.ContractSerialNumber" parameterType="java.lang.String">
   	 select c.id as contractId, c.serial_number as serialNumber
    from contract c 
-    <if test="principal != null">	
+    <if test="_parameter != null">	
 		LEFT JOIN contract_log cl on cl.cid = c.id
    </if>
    where c.deleted_sign = 0
-   <if test="principal !=null">	
-   and cl.principal = #{principal,jdbcType=VARCHAR}
+   <if test="_parameter !=null">	
+   and cl.principal = #{_parameter,jdbcType=VARCHAR}
    </if>
-    <if test="principal != null">
+    <if test="_parameter != null">
 	group by c.id
   </if>
    order by c.serial_number desc