优化代码

java110-bean/src/main/java/com/java110/dto/machine/MachineUserResultDto.java

@@ -32,6 +32,10 @@ public class MachineUserResultDto {
 
     private String reserved;
 
+    private String departmentId;
+
+    private String departmentName;
+
     public String getUserid() {
         return userid;
     }
@@ -119,4 +123,20 @@ public class MachineUserResultDto {
     public void setUserType(String userType) {
         this.userType = userType;
     }
+
+    public String getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(String departmentId) {
+        this.departmentId = departmentId;
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
 }

service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/StaffMachineTranslateBMOImpl.java

@@ -56,7 +56,6 @@ public class StaffMachineTranslateBMOImpl implements IStaffMachineTranslateBMO {
         List<UserDto> userDtos = userInnerServiceSMOImpl.getStaffs(userDto);
 
         if (userDtos == null || userDtos.size() != 1) {
-
             return null;
         }
 
@@ -64,24 +63,26 @@ public class StaffMachineTranslateBMOImpl implements IStaffMachineTranslateBMO {
         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.setFileSaveName(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.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 {