Merge branch 'bugfix/2023-07-25' into 'master'

好办登录一天后才删除无效的导购

See merge request !1369

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java

@@ -520,12 +520,11 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
                     delFlag = true ;
                 }
             }
-            Date time = DateUtil.addDay(new Date(),-1);
-            if (delFlag && null != clerk && clerk.getUpdateTime().after(time)){
-                delFlag = false;
-            }
             if(delFlag) {
-                this.mapper.delByClerkId(clerkId);
+                Date time = DateUtil.addDay(new Date(),-1);
+                if (null != clerk && clerk.getUpdateTime().before(time)){
+                    this.mapper.delByClerkId(clerkId);
+                }
             }else {
                 retList.add(item) ;
             }
@@ -549,12 +548,11 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
                 delFlag = true ;
             }
         }
-        Date time = DateUtil.addDay(new Date(),-1);
-        if (delFlag && null != clerk && clerk.getUpdateTime().after(time)){
-            delFlag = false;
-        }
         if(delFlag) {
-            this.mapper.delByClerkId(clerkId);
+            Date time = DateUtil.addDay(new Date(),-1);
+            if (null != clerk && clerk.getUpdateTime().before(time)){
+                this.mapper.delByClerkId(clerkId);
+            }
             dto = null ;
         }
         return dto ;