From 54a85886ceb6d7550bbde1494e67d7403d560940 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 20 八月 2020 15:11:25 +0800
Subject: [PATCH] 优化费用

---
 service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/StaffMachineTranslateBMOImpl.java |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/StaffMachineTranslateBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/StaffMachineTranslateBMOImpl.java
index 713c3c8..99e9549 100644
--- a/service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/StaffMachineTranslateBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/StaffMachineTranslateBMOImpl.java
@@ -3,11 +3,11 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.bmo.machineTranslate.IStaffMachineTranslateBMO;
 import com.java110.api.listener.machineTranslate.MachineQueryUserInfoListener;
-import com.java110.core.smo.common.IFileInnerServiceSMO;
-import com.java110.core.smo.common.IFileRelInnerServiceSMO;
-import com.java110.core.smo.common.IMachineTranslateInnerServiceSMO;
-import com.java110.core.smo.community.ICommunityInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.intf.common.IFileInnerServiceSMO;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
 import com.java110.dto.file.FileDto;
 import com.java110.dto.file.FileRelDto;
 import com.java110.dto.machine.MachineTranslateDto;
@@ -56,7 +56,6 @@
         List<UserDto> userDtos = userInnerServiceSMOImpl.getStaffs(userDto);
 
         if (userDtos == null || userDtos.size() != 1) {
-
             return null;
         }
 
@@ -64,24 +63,28 @@
         fileRelDto.setObjId(reqJson.getString("faceid"));
         fileRelDto.setRelTypeCd("12000");
         List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+        String tmpImg = "";
         if (fileRelDtos == null || fileRelDtos.size() != 1) {
-            return null;
-        }
-        FileDto fileDto = new FileDto();
-        fileDto.setFileId(fileRelDtos.get(0).getFileSaveName());
-        fileDto.setCommunityId(communityId);
-        List<FileDto> fileDtos = fileInnerServiceSMOImpl.queryFiles(fileDto);
-        if (fileDtos == null || fileDtos.size() != 1) {
-            return null;
+            tmpImg = "";
+        } else {
+            FileDto fileDto = new FileDto();
+            fileDto.setFileSaveName(fileRelDtos.get(0).getFileSaveName());
+            fileDto.setCommunityId(communityId);
+            List<FileDto> fileDtos = fileInnerServiceSMOImpl.queryFiles(fileDto);
+            if (fileDtos == null || fileDtos.size() != 1) {
+                tmpImg = "";
+            } else {
+                tmpImg = fileDtos.get(0).getContext();
+            }
         }
         userDto = userDtos.get(0);
-
         MachineUserResultDto machineUserResultDto = new MachineUserResultDto();
         machineUserResultDto.setUserid(userDto.getUserId());
+        machineUserResultDto.setDepartmentId(userDto.getParentOrgId());
+        machineUserResultDto.setDepartmentName(userDto.getParentOrgName());
         machineUserResultDto.setGroupid(communityId);
         machineUserResultDto.setGroup(reqJson.getString("communityName"));
         machineUserResultDto.setName(userDto.getName());
-        String tmpImg = fileDtos.get(0).getContext();
         machineUserResultDto.setFaceBase64(tmpImg);
         machineUserResultDto.setIdNumber(userDto.getTel());
         try {

--
Gitblit v1.8.0