Merge branch 'dev' of http://git.pseer.com/platform/hp-smart

src/main/java/com/baosight/hpjx/hp/mt/service/ServiceHPMT002.java

@@ -398,6 +398,7 @@ public class ServiceHPMT002 extends ServiceBase {
         try {
 
                 CommonsMultipartFile multipartFile = Base64ToMultipartFile.base64toMultipartFile(files);
+            System.out.println("--------------------------------转换Base64成功");
                 JSONObject upload = UploadUtils.upload(multipartFile);
                 inInfo.set("id",upload.getString("docId"));
             inInfo.setMsg("上传成功!");

src/main/java/com/baosight/hpjx/hp/mt/untils/UploadUtils.java

@@ -45,10 +45,12 @@ public class UploadUtils {
             filePath = multipartFile.getOriginalFilename();
             Long docSize = multipartFile.getSize();
             String chgName = transformFileName(filePath);
+            System.out.println("----------------------------------解析Path");
             String attachmentName;
                 Map<String, String> pathMap = getRealPath("A");
                 msg = (String)pathMap.get("dirId");
                 category = (String)pathMap.get("path");
+        System.out.println("----------------------------------获取dirId成功");
                 checkInvalidPath(category);
                 File dir = new File(category);
                 if (!dir.exists()) {
@@ -120,6 +122,7 @@ public class UploadUtils {
         Map hashMap = new HashMap();
         hashMap.put("fkey","docRootDir");
         List<Map> query = DaoBase.getInstance().query("EDCC03.query",hashMap);
+        System.out.println("----------------------------------获取path地址");
         if (query.get(0).get("fvalue")!=null) {
             ROOT_PATH= (String) query.get(0).get("fvalue");
         }

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ015.java

@@ -96,7 +96,7 @@ public class ServiceHPPZ015 extends ServiceBase {
             HPPZ015.setProjCode(hpsc001.getProjCode());
             HPPZ015.setTemplateName(inInfo.getString("templateName"));
             HPPZ015.setCreatedBy(UserSession.getUserId());
-            HPPZ015.setCompanyCode(UserSession.getUserId());
+            HPPZ015.setCompanyCode(UserSessionUtils.getCompanyCode());
             HPPZ015.setCreatedName(UserSession.getUserId()+"-"+UserSession.getLoginCName());
             HPPZ015.setCreatedTime(sdf.format(new Date()));
             HPPZ015.setUpdatedBy(null);