From 562c2e2c3e4c3409cfce4c019c347c984ecbe806 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Tue, 16 Apr 2024 09:22:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E6=8B=89=E5=8F=96?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E9=97=AE=E9=A2=98=EF=BC=8C=E6=94=B9=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E4=B8=BA=E4=B8=9A=E5=8A=A1=E4=B8=BB=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocr/thread/tasks/PictureDisposeTask.java  | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java
index 7d55ba48..2c1af2ec 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/thread/tasks/PictureDisposeTask.java
@@ -67,22 +67,24 @@ public class PictureDisposeTask implements Runnable{
                 //不为空开始组装参数 入库
                 OcrPicture picture = new OcrPicture();
                 picture.setLocation(JSONObject.toJSONString(pictureSourceResult.getLocation()));
-                //租户编号
-                picture.setTenantId(pictureSourceResult.getTenantNo());
-                //租户名称
-                picture.setTenantname(pictureSourceResult.getTenantName());
-                //租户状态
-                if(pictureSourceResult.getTenantStatus()!=null){
-                    picture.setTenantstatus(pictureSourceResult.getTenantStatus().toString());
-                }
                 //业务主体
+                picture.setTenantId(pictureSourceResult.getAccountNo());
+                //业务主体名称
+                picture.setTenantname(pictureSourceResult.getAccountName());
+                //业务主体状态
+                if(pictureSourceResult.getAccountStatus()!=null){
+                    picture.setTenantstatus(pictureSourceResult.getAccountStatus().toString());
+                }
+                //租户编号
                 if(pictureSourceResult.getAccountNo()!=null){
                     picture.setPictureid(pictureSourceResult.getAccountNo().toString());
                 }
-                //业务主体名称
+                //租户名称
                 picture.setPicturename(pictureSourceResult.getAccountName());
-                //业务主体状态
-                picture.setPicturestatus(pictureSourceResult.getPlanChildStatus());
+                //租户状态
+                if(pictureSourceResult.getAccountStatus()!=null) {
+                    picture.setPicturestatus(pictureSourceResult.getAccountStatus().toString());
+                }
                 //项目编号
                 if(pictureSourceResult.getProjectNo()!=null){
                     picture.setProjectid(pictureSourceResult.getProjectNo().toString());