Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -372,7 +372,7 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
     @Transactional
     public void deleteById(Long id) {
         if(id != null && id > 0){
-            String code = getMapper().getCodeById(id, new Long(1));
+            String code = getMapper().getCodeById(id, BaseContextHolder.getCompanyId());
             Map<String, Object> map = new HashMap<String, Object>();
             map.put("v_id",id);
             map.put("v_code", code);

applications/sale/sale-server/src/test/java/com/usoftchina/saas/sale/controller/SaleDownTest.java

@@ -1,8 +1,11 @@
 package com.usoftchina.saas.sale.controller;
 
-import com.usoftchina.saas.utils.JsonUtils;
-import com.usoftchina.saas.utils.http.HttpUtil;
+
+import com.usoft.b2b.access.entity.UserAccount;
+import com.usoft.b2b.access.utils.AccessUtils;
 import org.junit.Test;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
 
 import java.util.HashMap;
 
@@ -20,5 +23,19 @@ public void testA_httpUtil() {
      HashMap<String, String> params = new HashMap<String, String>();
      params.put("data", JsonUtils.toJsonString(replies));
      HttpUtil.sendPostRequest(URL + "10041166",);*/
+
+
 }
+
+    @Test
+    public void testPost() throws Exception {
+        UserAccount account = new UserAccount();
+        account.setAppId("SAAS");
+        account.setUserUU(1000003217L);
+        account.setSpaceUU(10041166L);
+        MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+        map.add("json", "this is a json string");
+        String result = AccessUtils.postForObject("http://10.1.51.24:8088/platform-b2b/product/kind/test", account, String.class, map);
+        System.out.println(result);
+    }
 }