* bug fix

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

@@ -99,7 +99,7 @@ public class TaCompanyController extends BaseController {
             queryWrapper.like(StringUtils.isNotBlank(companyName), "company_name", companyName);
             queryWrapper.like(StringUtils.isNotBlank(companyCode), "company_code", companyCode);
             queryWrapper.eq(StringUtils.isNotBlank(certifiedStatus), "certified_status", certifiedStatus);
-            queryWrapper.eq("status", 2);
+            queryWrapper.eq("status", 4);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaCompany> result = iTaCompanyService.page(pg, queryWrapper);

src/main/java/com/huiju/estateagents/service/impl/TaRaiseRecordServiceImpl.java

@@ -412,7 +412,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         }
 
         // 是否展示签署合同入口
-        if (CommConstant.STATUS_NORMAL == taRaiseRecord.getStatus() || CommConstant.PAY_STATUS_PAID == taRaiseRecord.getPayStatus()) {
+        if (CommConstant.STATUS_NORMAL == taRaiseRecord.getStatus() && CommConstant.PAY_STATUS_PAID == taRaiseRecord.getPayStatus()) {
             // 是否有认筹业务合同配置
             QueryWrapper<TaContractBusiness> taContractBusinessQueryWrapper = new QueryWrapper<>();
             taContractBusinessQueryWrapper.eq("target_id", raiseRecordId);
@@ -423,16 +423,18 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
                 // 是否有有关联的认筹合同
                 QueryWrapper<TaContract> taContractQueryWrapper = new QueryWrapper<>();
                 taContractQueryWrapper.eq("org_id", orgId);
-                taContractQueryWrapper.eq("company_id", taContractBusiness.getCompanyId());
+                taContractQueryWrapper.eq("target_type", "raise");
                 taContractQueryWrapper.eq("target_id", taRaiseRecord.getRaiseId());
+                taContractQueryWrapper.eq("company_id", taContractBusiness.getCompanyId());
                 taContractQueryWrapper.eq("person_id", personId);
                 TaContract taContract = iTaContractService.getOne(taContractQueryWrapper);
                 if (taContract != null) {
-                    if (taContract.getCustomerTime() == null) {
-                        taRaiseRecord.setShowContract(1);
-                    } else {
+                    // 合同状态正常
+                    if (CommConstant.STATUS_NORMAL == taContract.getStatus()) {
                         taRaiseRecord.setShowContract(0);
                         map.put("taContract", taContract);
+                    } else {
+                        taRaiseRecord.setShowContract(1);
                     }
                 } else {
                     taRaiseRecord.setShowContract(1);