提交代码

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/LockConfig.java

@@ -36,7 +36,7 @@ public class LockConfig implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	private Integer id;
+	private Long id;
 	/**
 	* 模块名称
 	*/

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/controller/PurchaseOrderController.java

@@ -215,6 +215,14 @@ public class PurchaseOrderController extends BladeController {
 		if(CollectionUtils.isNotEmpty(records))
 		{
 			records.forEach(e->{
+				if(e.getBelongToCorpId()!=null)
+				{
+					R<CorpsDesc> corpMessage3 = corpsDescClient.getCorpMessage(e.getBelongToCorpId());
+					if(corpMessage3.getData()!=null)
+					{
+						e.setBelongCompany(corpMessage3.getData().getCname());
+					}
+				}
 
 				//制单人名字
 				if(e.getCreateUser()!=null)