Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/dept/department.vue

@@ -349,12 +349,11 @@ export default {
   filters: {
     workmanList(arr) {
       if (arr.length) {
-        let workers = arr
-          .map((v) => {
-            return v.name;
-          })
-          .join("/");
-        return workers;
+        let workerList = [...arr];
+        let worker = workerList.sort((a, b) => {
+          return b.lastLoginTime - a.lastLoginTime;
+        })[0].name;
+        return worker;
       }
     },
   },