From 464ebae862c0af745e48a209faf993b3a909bd61 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 1 Dec 2020 14:12:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=80=83=E8=AF=84=E7=BB=84=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=BA=E8=BF=87=E6=BB=A4is=5Fdelete=3D1=E5=BE=97?=
 =?UTF-8?q?=E8=81=8C=E4=BD=8D=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/flow/service/impl/EvaluationGroupServiceImpl.java   | 1 -
 src/main/resources/mapper/generator/StaffDao.xml                | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

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

From 65f1023f0f2e57cd9d43e2d8e6c999ffdfd9dd55 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 1 Dec 2020 14:25:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BB=84=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=94=B9=E6=88=90=E5=80=92=E5=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/flow/EvaluationGroupMapper.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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