Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/eContract/service/impl/TaCompanySealUtil.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
@@ -89,7 +90,7 @@ public class TaCompanySealUtil {
         stringBuilder.append("contract_id="+contractId+"&");
         stringBuilder.append("msg_digest="+msgDigest+"&");
         stringBuilder.append("notify_url="+fadadaProperties.getAuthNotifyUrl()+"&");
-        stringBuilder.append("return_url="+fadadaProperties.getAuthReturnUrl() + companyId);
+        stringBuilder.append("return_url="+ URLEncoder.encode(fadadaProperties.getAuthReturnUrl(), "UTF-8") + companyId);
 
         return stringBuilder.toString();
     }

src/main/resources/mapper/eContract/TaContractMapper.xml

@@ -29,7 +29,7 @@
             </if>
             <choose>
                 <when test="signatoryStatus == 0">
-                    AND t.signatory_time = NULL
+                    AND t.signatory_time is NULL
                 </when>
                 <when test="signatoryStatus == 1">
                     AND t.signatory_time is not NULL
@@ -38,7 +38,7 @@
             </choose>
             <choose>
                 <when test="customerStatus == 0">
-                    AND t.customer_time = NULL
+                    AND t.customer_time is NULL
                 </when>
                 <when test="customerStatus == 1">
                     AND t.customer_time is not NULL