Merge branch 'bugfix/2023-08-31' into 'master'

Bugfix/2023 08 31

See merge request !1446

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

@@ -136,6 +136,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
             List<StaffClerkRelationDTO> relationList = this.listByStaffId(wxEnterpriseId, staffId) ;
             Set<String> set = relationList.stream().map(o->o.getEnterpriseId()).collect(Collectors.toSet()) ;
             // 否关联的多个商户
+            logger.info("关联商户={}",set.size());
             boolean multipleFlag = set.size() > 1 ;
             List<String> storeIdList = relationList.stream().filter(o->!storeId.equals(o.getStoreId()) && o.getEnterpriseId().equals(enterpriseId)).map(o->o.getStoreId()).collect(Collectors.toList()) ;
             logger.info("成员{},关联门店数={},同商户下的门店={}",staffId,relationList.size(),JSON.toJSON(storeIdList));
@@ -173,6 +174,10 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
                     newClerkId = mainClerk.getClerkId() ;
                     logger.info("查询到成员的主门店导购={},{}",staffId,newClerkId);
                 }
+            }else {
+                if(multipleFlag) {
+                    needFlush = true ;
+                }
             }
         }
         // 删除关联关系