Browse Source

订单详情和列表显示特批类型异常修改

anderx 1 year ago
parent
commit
a3dde93b43

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

@@ -1406,8 +1406,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
                        left join admin f on e.initiate=f.id left join organization_identity g on a.buyer_id=g.uid
                        left join t_order_high_tech tht on a.order_no=tht.order_no
                        left join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
-                                  from t_order_approval where order_no=#{orderNo,jdbcType=VARCHAR}
-                                  group by order_no) toa on a.order_no=toa.order_no
+                                  from t_order_approval group by order_no) toa on a.order_no=toa.order_no
     where   a.order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
 

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -556,7 +556,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 
 		//如果订单是特批
 		if (new1.getApproval()==ApprovalNewState.TPDSH.getCode()|| new1.getApproval()==ApprovalNewState.TPBH.getCode()) {
-			if (order.getOperationGuaranteeId()!=null){
+			if (StringUtils.isNotEmpty(order.getOperationGuaranteeId())){
 				t.setProcessStatus(ProcessStatus.YYBZSH.getCode());
 				str.append(order.getOperationGuaranteeName()).append(",");
 				aids.add(order.getOperationGuaranteeId());