Antiloveg 8 years ago
parent
commit
f577b578dd

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminPatentApiController.java

@@ -331,7 +331,7 @@ public class AdminPatentApiController extends CertifyApiController {
 		Calendar cal = Calendar.getInstance();
 		OrgRatepay ratepay = orgRatepayService.selectRatepayByUidAndYear(uid, cal.get(Calendar.YEAR) - 1);
 
-		if (null == ratepay) {
+		if (null == ratepay || StringUtils.isBlank(ratepay.getTaxReturnUrl())) {
 			return res;
 		}
 

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -378,12 +378,12 @@
 		LEFT JOIN organization_identity i on i.uid = p.uid
 		LEFT JOIN admin a on p.consultant = a.id 
 		LEFT JOIN admin ad on p.founder = ad.id 
-   	    LEFT JOIN tech_website w on p.department = w.id 
+   	    LEFT JOIN tech_website w on p.department = w.id and w.deleted_sign = 0
    	    LEFT JOIN contract c on c.id = p.contract_id
     <if test="principal != null">
 		left join contract_log l on p.contract_id=l.cid
 	</if>
-	where p.deleted_sign = 0 and w.deleted_sign = 0
+	where p.deleted_sign = 0 
 	<if test="principal != null">
 		and l.principal = #{principal,jdbcType=VARCHAR}
 	</if>