diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java
index 13cfcc7b..7daa81ff 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TicketServiceImpl.java
@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.nflg.mobilebroken.common.constant.Constant;
 import com.nflg.mobilebroken.common.constant.TicketState;
 import com.nflg.mobilebroken.common.constant.TicketUrgency;
 import com.nflg.mobilebroken.common.pojo.dto.UserDTO;
@@ -132,19 +133,23 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
             request.setEndTime(request.getEndTime().plusDays(1));
         }
         if (request.getType()==1){
-            return baseMapper.searchMy(new Page<>(request.getPage(), request.getPageSize()), request, user.getId(),user.getFrom(),language);
-        }else if (request.getType()==2){
-            return baseMapper.searchFollow(new Page<>(request.getPage(), request.getPageSize()), request, user.getId(),user.getFrom(),language);
-        }else if (request.getType()==3) {
-            String companyCode = "";
-            if (!user.getIsPrimary()){
-                TBaseCustomer customer=customerService.getById(user.getCompanyIds().get(0));
-                if (Objects.nonNull(customer)){
-                    companyCode = customer.getAgencyCompanyCode();
+            return baseMapper.searchMy(new Page<>(request.getPage(), request.getPageSize()), request, user.getId(), user.getFrom(), language);
+        } else if (request.getType() == 2) {
+            return baseMapper.searchFollow(new Page<>(request.getPage(), request.getPageSize()), request, user.getId(), user.getFrom(), language);
+        } else if (request.getType() == 3) {
+            if (StrUtil.equals(AppUserUtil.getFrom(), Constant.FROM_ADMIN)) {
+                return baseMapper.searchArea(new Page<>(request.getPage(), request.getPageSize()), request, null, user.getId(), language, null, null);
+            } else {
+                String companyCode = "";
+                if (!user.getIsPrimary()) {
+                    TBaseCustomer customer = customerService.getById(user.getCompanyIds().get(0));
+                    if (Objects.nonNull(customer)) {
+                        companyCode = customer.getAgencyCompanyCode();
+                    }
                 }
+                return baseMapper.searchArea(new Page<>(request.getPage(), request.getPageSize()), request
+                        , StrUtil.join(",", user.getCompanyIds()), user.getId(), language, user.getIsPrimary(), companyCode);
             }
-            return baseMapper.searchArea(new Page<>(request.getPage(), request.getPageSize()), request
-                    , StrUtil.join(",",user.getCompanyIds()), user.getId(),language,user.getIsPrimary(),companyCode);
         }
         return null;
     }
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
index 4a9ac9a2..bc5b04ac 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TicketMapper.xml
@@ -121,7 +121,7 @@
         FROM ticket t
         LEFT JOIN app_user u ON t.user_id=u.id
         LEFT JOIN app_area a2 ON u.area_id=a2.id
-        LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=0
+        LEFT JOIN ticket_follow tf ON t.id=tf.ticket_id AND tf.user_id=#{userId} AND tf.from=IF(#{from}='app',0,1)
         LEFT JOIN ticket_evaluate te ON t.id=te.ticket_id AND t.state=2
         LEFT JOIN t_base_part p ON t.component_id=p.id
         LEFT JOIN t_base_language_data l ON p.id=l.source_id AND l.language_code=#{language}