[商户管理][修改][回显账户信息]

mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java

@@ -116,9 +116,12 @@ public class WxMerchantServiceImpl implements WxMerchantService {
 
         //分账信息
         WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(wxMerchant);
-        wxMerchant.setAccountId(receiver.getReceiverAccount());
-        wxMerchant.setAccountName(receiver.getTrueName());
-        wxMerchant.setAccountTypeValue(receiver.getReceiverType());
+        if(receiver!=null){
+            wxMerchant.setAccountId(receiver.getReceiverAccount());
+            wxMerchant.setAccountName(receiver.getTrueName());
+            wxMerchant.setAccountTypeValue(receiver.getReceiverType());
+        }
+
 
         return wxMerchant;
     }