Merge remote-tracking branch 'origin/master'

apps/account/serializers.py

@@ -10,7 +10,7 @@ from apps.log.models import BizLog
 from utils import get_remote_addr
 from utils.booleancharfield import BooleanCharField
 from utils.exceptions import CustomError
-from apps.account.models import ManageStoreUser
+from apps.account.models import ManageStoreUser,OfficeStoreUser
 
 User = get_user_model()
 jwt_payload_handler = api_settings.JWT_PAYLOAD_HANDLER
@@ -63,6 +63,7 @@ class EmployeeSerializer(serializers.ModelSerializer):
     groups = serializers.SerializerMethodField()
     group_ids = serializers.PrimaryKeyRelatedField(source='groups', many=True, read_only=True)
     manager_barnchs = serializers.SerializerMethodField()
+    office_stores = serializers.SerializerMethodField()
 
     def get_manager_barnchs(self, obj):
         stores = ManageStoreUser.objects.filter(manage_user=obj)
@@ -71,6 +72,10 @@ class EmployeeSerializer(serializers.ModelSerializer):
     def get_groups(self, obj):
         return ','.join(obj.groups.values_list('name', flat=True))
 
+    def get_office_stores(self, obj):
+        stores = OfficeStoreUser.objects.filter(office_user=obj)
+        return ','.join(stores.values_list('store__name', flat=True))
+
     class Meta:
         model = User
         # fields = '__all__'