Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

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;

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" >

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>