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

src/main/java/com/huiju/estateagents/eContract/controller/TaCompanyController.java

@@ -549,8 +549,10 @@ public class TaCompanyController extends BaseController {
         taCompanySealQueryWrapper.eq("company_id", taCompany.getCompanyId());
         taCompanySealQueryWrapper.eq("default_seal", CommConstant.STATUS_NORMAL);
         TaCompanySeal oldDefaultSeal = iTaCompanySealService.getOne(taCompanySealQueryWrapper);
-        oldDefaultSeal.setDefaultSeal(CommConstant.STATUS_UNACCALIMED);
-        iTaCompanySealService.updateById(oldDefaultSeal);
+        if (oldDefaultSeal != null){
+            oldDefaultSeal.setDefaultSeal(CommConstant.STATUS_UNACCALIMED);
+            iTaCompanySealService.updateById(oldDefaultSeal);
+        }
 
         //更新默认章
         taCompanySeal.setDefaultSeal(CommConstant.STATUS_NORMAL);

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

@@ -221,6 +221,7 @@ public class TaCompanyServiceImpl extends ServiceImpl<TaCompanyMapper, TaCompany
         QueryWrapper<TaContract> taContractQueryWrapper = new QueryWrapper<>();
         taContractQueryWrapper.eq("target_type", CommConstant.AUTH);
         taContractQueryWrapper.eq("company_id", companyId);
+        taContractQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
         TaContract taContract = taContractMapper.selectOne(taContractQueryWrapper);
 
         TaCompany taCompany = taCompanyMapper.selectById(companyId);

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

@@ -32,7 +32,7 @@
                     AND t.signatory_time = NULL
                 </when>
                 <when test="signatoryStatus == 1">
-                    AND t.signatory_time &lt;&gt; NULL
+                    AND t.signatory_time is not NULL
                 </when>
                 <otherwise></otherwise>
             </choose>
@@ -41,7 +41,7 @@
                     AND t.customer_time = NULL
                 </when>
                 <when test="customerStatus == 1">
-                    AND t.customer_time &lt;&gt; NULL
+                    AND t.customer_time is not NULL
                 </when>
                 <otherwise></otherwise>
             </choose>
@@ -65,6 +65,7 @@
             LEFT JOIN ta_channel_app_relation t5 ON t.org_id = t5.org_id
             LEFT JOIN ta_channel_proxy t6 ON t5.channel_id = t6.channel_id
         <where>
+            t.target_type != 'auth'
             <if test=" bo.companyName != null and bo.companyName != ''">
                 AND t2.company_name like CONCAT('%',#{bo.companyName} , '%')
             </if>