diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
index 941867bb..7625cba0 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java
@@ -183,7 +183,6 @@ public class EvaluationGroupServiceImpl extends ServiceImpl<EvaluationGroupMappe
 						group.setScore(1);
 					}
 				}
-
 			}
 		}
 		return pageUtils;
diff --git a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml
index 5989893b..ba5c7090 100644
--- a/src/main/resources/mapper/flow/EvaluationGroupMapper.xml
+++ b/src/main/resources/mapper/flow/EvaluationGroupMapper.xml
@@ -111,8 +111,9 @@
                 #{item}
             </foreach>
             )
-            group by id order by id desc
+
         </if>
+        group by id order by id desc
     </select>
 
     <select id="selectEvaluationGroupByIds" resultType="EvaluationGroup" >
diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml
index 2221ceb7..469c6543 100644
--- a/src/main/resources/mapper/generator/StaffDao.xml
+++ b/src/main/resources/mapper/generator/StaffDao.xml
@@ -469,7 +469,7 @@
         <foreach collection="ids" item="id" separator=",">
             #{id}
         </foreach>
-        ) and occupation.staff_status=0 order by field(staff.id,
+        ) and occupation.staff_status=0 and occupation.is_delete=0 order by field(staff.id,
         <foreach collection="ids" item="id" separator=",">
             #{id}
         </foreach>