Merge branch 'ol_12_30' into online

src/views/categroyManager/insideSetting/modals/handover.vue

@@ -132,7 +132,8 @@ export default {
       try {
         const res = await Promise.all([
           employeeFindEmployeeByRole({
-            rows: 99999
+            rows: 99999,
+            demissionflag: 0
           }),
           employeeLevelDetail({
             userId: this.detail.id