Merge remote-tracking branch 'origin/pet' into pet

src/views/oneCompany/reflection/components/info.vue

@@ -273,19 +273,21 @@ export default {
     getPeopleList(e) {
       return new Promise(resolve => {
         this.material.departmentName = e.name
-        requestFN(
+        if (e && e.id && e.id !== '') {
-          '/user/listAll',
+          requestFN(
-          {
+            '/user/listAll',
-            DEPARTMENT_ID: e.id
+            {
-          }
+              DEPARTMENT_ID: e.id
-        ).then((data) => {
+            }
-          this.dic.userList = data.userList
+          ).then((data) => {
-          this.material.userInfo = ''
+            this.dic.userList = data.userList
-          resolve(true)
+            this.material.userInfo = ''
-        }).catch((e) => {
+            resolve(true)
-          console.log(e)
+          }).catch((e) => {
-          resolve(true)
+            console.log(e)
-        })
+            resolve(true)
+          })
+        }
       })
     },
     chooseUser(e) {