diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
index 7841f544..ef65acdb 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/EamAdminData.java
@@ -8,60 +8,18 @@ import org.springframework.format.annotation.DateTimeFormat;
 import java.util.Date;
 
 public class EamAdminData extends QueryPage {
-    /**
-     *
-     */
     private String site;
-
-    /**
-     *
-     */
     private String adminID;
-
-    /**
-     *
-     */
     private String adminName;
-
-    /**
-     *
-     */
     private String phone;
-
-    /**
-     *
-     */
     private String department;
-
-    /**
-     *
-     */
+    private String departmentName;
     private String email;
-
-    /**
-     *
-     */
     private String tel;
-
-    /**
-     *
-     */
     private String levelID;
     private String adminLevelDesc;
-
-    /**
-     *
-     */
     private String mesUser;
-
-    /**
-     *
-     */
     private String active;
-
-    /**
-     *
-     */
     @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
     private Date createdDate;
@@ -73,6 +31,14 @@ public class EamAdminData extends QueryPage {
     // 更新人
     private String updateBy;
 
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+
     public String getCreatedBy() {
         return createdBy;
     }
diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
index 7317de41..dc33161f 100644
--- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
+++ b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
@@ -1053,7 +1053,7 @@ public interface EamMapper {
 
     String selectDeptByObjectID(String site, String objectID);
 
-    List<String> selectAdminIdByUserName(String site, String username);
+    String selectAdminIdByUserName(String site, String username);
 
     void defectReportWorkOrder(EamWorkOrderInData inData);
 
diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
index f5c119c4..4d033e93 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class EamServiceImpl implements EamService {
@@ -271,15 +272,19 @@ public class EamServiceImpl implements EamService {
         // 拼接部门
         for(EamAdminData data : eamAdminList.getRecords()){
             List<String> deptList = eamMapper.getDeptList(data.getSite(), data.getAdminID());
-            String dept = "";
-            for (int i = 0; i < deptList.size(); i++) {
-                if (dept.equals("")){
-                    dept = deptList.get(i);
-                }else {
-                    dept = dept + ";" + deptList.get(i);
+            String deptName = "";
+//            if (deptList.size() > 0) {
+                for (int i = 0; i < deptList.size(); i++) {
+                    if (deptList.get(i) != null){
+                        if (deptName.equals("")) {
+                            deptName = deptList.get(i);
+                        } else {
+                            deptName = deptName + ";" + deptList.get(i);
+                        }
+                    }
                 }
-            }
-            data.setDepartment(dept);
+                data.setDepartment(deptName);
+//            }
         }
         return new PageUtils(eamAdminList);
     }
@@ -1011,10 +1016,13 @@ public class EamServiceImpl implements EamService {
                 // 查询设备所属部门
                 String objDepartment = eamMapper.selectDeptByObjectID(ewoData.getSite(), ewoData.getObjectID());
                 // 查询用户所属部门
-                List<String> adminIDList = eamMapper.selectAdminIdByUserName(ewoData.getSite(), inData.getUsername());
-                List<String> deptList = eamMapper.getDeptList(ewoData.getSite(), adminIDList.get(0));
-                if (deptList.contains(objDepartment)){
-                    list.add(ewoData);
+                String adminID = eamMapper.selectAdminIdByUserName(ewoData.getSite(), inData.getUsername());
+                if (adminID != null){
+                    List<String> deptList = eamMapper.getDeptList(ewoData.getSite(), adminID);
+                    //List<String> nameList = deptList.stream().map(a -> a.getDepartmentName()).collect(Collectors.toList());
+                    if (deptList.contains(objDepartment)){
+                        list.add(ewoData);
+                    }
                 }
             }
             resultList.setRecords(list);