Merge pull request 'feat：修改回传无量云租户信息' (#157) from feat/updatePrevailCloudLog into test

Reviewed-on: #157

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java

@@ -761,8 +761,8 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl<OcrTaskchild
             dept = departmentService.getOne(new LambdaQueryWrapper<Department>().eq(Department::getDeptno, dept.getParentid()));
         }
         FlowResultDto flowResultDto = new FlowResultDto();
-        flowResultDto.setTenantNo(Long.valueOf(dept.getDeptno()));
-        flowResultDto.setAccountNo(Long.parseLong(picture.getTenantId().toString()));
+        flowResultDto.setTenantNo(dept == null ? picture.getTenantId() : Long.valueOf(dept.getDeptno()));
+        flowResultDto.setAccountNo(picture.getTenantId());
         flowResultDto.setTaskNo(Long.parseLong(picture.getRemark()));
         flowResultDto.setPictureMatchDegree(BigDecimal.valueOf(picture.getSimilarityscore()));
         flowResultDto.setIsPictureRepeat(picture.getField14() == null ? 0 : Integer.valueOf(picture.getField14()));

runstart/src/main/resources/application-dev.yml

@@ -160,15 +160,15 @@ mybatis-plus:
 xiaoyao:
   web:
     #上传文件路径
-    uploadPath: D:/ideaWork/jeecg/ocr/htmlweb/upload
+    uploadPath: /Users/sunchenliang/IdeaProjects/ocr/htmlweb/upload
     #页面根路径
-    frontPath: D:/ideaWork/jeecg/ocr/htmlweb
+    frontPath: /Users/sunchenliang/IdeaProjects/ocr/htmlweb
     #js、css、图片存放路径
-    staticPath: D:/ideaWork/jeecg/ocr/htmlweb/static
+    staticPath: /Users/sunchenliang/IdeaProjects/ocr/htmlweb/static
     #页面模版路径
-    webPath: D:/ideaWork/jeecg/ocr/htmlweb/web
+    webPath: /Users/sunchenliang/IdeaProjects/ocr/htmlweb/web
     #Lucene索引路径
-    lucenePath: D:/ideaWork/jeecg/ocr/htmlweb/lucene/indexDir
+    lucenePath: /Users/sunchenliang/IdeaProjects/ocr/htmlweb/lucene/indexDir
     #是否开启flowable
     haveFlowable: true
   webconfig: