Merge branch 'feature/xgh/20250609' into 'master'

异常

See merge request !3040

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

@@ -1098,6 +1098,10 @@ public class StaffApiServiceImpl implements StaffApiService {
                 String storeWidgetId = this.powerService.getStoreWidgetId(null, clerkId);
                 if(null != storeWidgetId) {
                     Page<StoreDTO> page = storeWidgetService.getStoreWidgetStore(storeWidgetId, null, clerkDTO.getEnterpriseId(), pageParam, null,null);
+                    if(null == page || CollectionUtils.isEmpty(page.getResult())) {
+                        storeRoleDTO.setStoreCount(0);
+                        return storeRoleDTO;
+                    }
                     storeId = page.getResult().get(0).getStoreId();
                     storeCount = page.getTotalCount();
                 }