diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml
index 24a0ae81..2f68aa5d 100644
--- a/anomaly/src/main/resources/mapper/ReportMapper.xml
+++ b/anomaly/src/main/resources/mapper/ReportMapper.xml
@@ -433,40 +433,48 @@
 
     <select id="findQualityInspectionReport" parameterType="java.util.HashMap" resultType="java.util.HashMap">
         SELECT  Szsd.PROD_HOURS* CFPT.VALUE*zab.PB_QTY PRICE,CFPT.VALUE PRICE_TIME,zab.CREATED_DATE_TIME,zab.ABNORMAL_NO ABNORMAL_NO,
-                dflt.DATA_TAG PRODUCT_CATEGORY,
-                dflt2.DATA_TAG DISCOVER,
-                i.ITEM ITEM ,it.DESCRIPTION ITEM_DESCRIPTION,
-                COALESCE(itemNumber.VALUE,zab.ITEM_NUMBER) ITEM_NUMBER,
-               zab.SHOP_ORDER,
-                mapNo.VALUE MAP_NO,zab.PB_DESCRIPTION PB_DESCRIPTION,zsd.EMPLOYEE_DESCRIPTION OPERATOR,
-               CASE WHEN zab."TYPE" = 'Z' THEN '质量异常'
-                    WHEN zab."TYPE" = 'Q' THEN '其他异常'
-                    WHEN zab."TYPE" = 'S' THEN '设备异常' END "TYPE",
-                znu.FULL_NAME INSPECTOR ,
-                zab.PB_GRADE PB_GRADE ,
-                zabd.PRINCIPAL_USER PRINCIPAL_USER,
-                LISTAGG(nct.DESCRIPTION , ';') WITHIN GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE_DESCRIPTION,
-                zabd.DUTY_CAUSE_DESCRIPTION DUTY_CAUSE_DESCRIPTION,zabd.BEFORE_MEASURE BEFORE_MEASURE,
-                CASE WHEN zabd.ABNORMAL_METHOD = 'X' THEN '线下换料'
-                     WHEN zabd.ABNORMAL_METHOD = 'S' THEN '试装'
-                     WHEN zabd.ABNORMAL_METHOD = 'R' THEN '让步放心'
-                     WHEN zabd.ABNORMAL_METHOD = 'C' THEN '报废'
-                     WHEN zabd.ABNORMAL_METHOD = 'P' THEN '配作'
-                     WHEN zabd.ABNORMAL_METHOD = 'F' THEN '返修'
-                     WHEN zabd.ABNORMAL_METHOD = 'FW' THEN '返修(外协)'
-                     WHEN zabd.ABNORMAL_METHOD = 'FB' THEN '返修(不返回原工艺)'
-                     ELSE ''
-                    END ABNORMAL_METHOD,zabd.RESOLVE_REMARK RESOLVE_REMARK,znu2.FULL_NAME RESOLVE_USER,
-                zabd.CLOSED_DATE_TIME CLOSED_DATE_TIME,zab.NC_QTY NC_QTY,zab.PB_QTY PB_QTY,
-                CASE WHEN (zabd.ABNORMAL_METHOD ='F' AND zab.SHOP_ORDER IS NOT NULL) THEN TO_CHAR(so.QTY_TO_BUILD,'9999')
-                     WHEN zabd.ABNORMAL_METHOD = 'F' THEN  TO_CHAR(zab.PB_QTY,'9999')  ELSE '' END NUMBERS,
-                zsd.EMPLOYEE_DESCRIPTION  DISPATCH_USER ,ot.DESCRIPTION OPERATION ,
-                r2.RESRCE RESRCE,r2.DESCRIPTION RESRCE_DESCRIPTION,zsd.RESOURCE_TYPE RESOURCE_TYPE,
-               rt.DESCRIPTION RESOURCE_TYPE_DESCRIPTION,zabd.DUTY_CAUSE_TYPE DUTY_CAUSE_TYPE,zabd.DUTY_TYPE DUTY_TYPE,
-               zabd.DUTY_DEPART DUTY_DEPART,TO_CHAR(TO_NUMBER(zabd.CLOSED_DATE_TIME - zab.RESPONSE_DATE_TIME)*24,'FM9999990.000') WORKING_HOURS,
-               CASE WHEN zab.SFC IS NOT NULL THEN '质量异常'
-               ELSE '外协质量异常'
-               END ABNORMAL_TYPE
+        dflt.DATA_TAG PRODUCT_CATEGORY,
+        dflt2.DATA_TAG DISCOVER,
+        i.ITEM ITEM ,it.DESCRIPTION ITEM_DESCRIPTION,
+        COALESCE(itemNumber.VALUE,zab.ITEM_NUMBER) ITEM_NUMBER,
+        zab.SHOP_ORDER,
+        mapNo.VALUE MAP_NO,zab.PB_DESCRIPTION PB_DESCRIPTION,zsd.EMPLOYEE_DESCRIPTION OPERATOR,
+        CASE WHEN zab."TYPE" = 'Z' THEN '质量异常'
+        WHEN zab."TYPE" = 'Q' THEN '其他异常'
+        WHEN zab."TYPE" = 'S' THEN '设备异常' END "TYPE",
+        CASE WHEN Szsd.handle IS NULL THEN ot.DESCRIPTION
+        ELSE ot2.DESCRIPTION END OPERATION,
+        CASE WHEN Szsd.handle IS NULL THEN r2.RESRCE
+        ELSE RES.RESRCE END RESRCE,
+        CASE WHEN Szsd.handle IS NULL THEN r2.DESCRIPTION
+        ELSE RES.DESCRIPTION END RESRCE_DESCRIPTION,
+        CASE WHEN Szsd.handle IS NULL THEN zsd.RESOURCE_TYPE
+        ELSE Szsd.RESOURCE_TYPE END RESOURCE_TYPE,
+        CASE WHEN Szsd.handle IS NULL THEN rt.DESCRIPTION
+        ELSE rt2.DESCRIPTION END RESOURCE_TYPE_DESCRIPTION,
+        znu.FULL_NAME INSPECTOR ,
+        zab.PB_GRADE PB_GRADE ,
+        zabd.PRINCIPAL_USER PRINCIPAL_USER,
+        LISTAGG(nct.DESCRIPTION , ';') WITHIN GROUP(ORDER BY zab.ABNORMAL_NO) NC_CODE_DESCRIPTION,
+        zabd.DUTY_CAUSE_DESCRIPTION DUTY_CAUSE_DESCRIPTION,zabd.BEFORE_MEASURE BEFORE_MEASURE,
+        CASE WHEN zabd.ABNORMAL_METHOD = 'X' THEN '线下换料'
+        WHEN zabd.ABNORMAL_METHOD = 'S' THEN '试装'
+        WHEN zabd.ABNORMAL_METHOD = 'R' THEN '让步放心'
+        WHEN zabd.ABNORMAL_METHOD = 'C' THEN '报废'
+        WHEN zabd.ABNORMAL_METHOD = 'P' THEN '配作'
+        WHEN zabd.ABNORMAL_METHOD = 'F' THEN '返修'
+        WHEN zabd.ABNORMAL_METHOD = 'FW' THEN '返修(外协)'
+        WHEN zabd.ABNORMAL_METHOD = 'FB' THEN '返修(不返回原工艺)'
+        ELSE ''
+        END ABNORMAL_METHOD,zabd.RESOLVE_REMARK RESOLVE_REMARK,znu2.FULL_NAME RESOLVE_USER,
+        zabd.CLOSED_DATE_TIME CLOSED_DATE_TIME,zab.NC_QTY NC_QTY,zab.PB_QTY PB_QTY,
+        CASE WHEN (zabd.ABNORMAL_METHOD ='F' AND zab.SHOP_ORDER IS NOT NULL) THEN TO_CHAR(so.QTY_TO_BUILD,'9999')
+        WHEN zabd.ABNORMAL_METHOD = 'F' THEN  TO_CHAR(zab.PB_QTY,'9999')  ELSE '' END NUMBERS,
+        zsd.EMPLOYEE_DESCRIPTION  DISPATCH_USER ,zabd.DUTY_CAUSE_TYPE DUTY_CAUSE_TYPE,zabd.DUTY_TYPE DUTY_TYPE,
+        zabd.DUTY_DEPART DUTY_DEPART,TO_CHAR(TO_NUMBER(zabd.CLOSED_DATE_TIME - zab.RESPONSE_DATE_TIME)*24,'FM9999990.000') WORKING_HOURS,
+        CASE WHEN zab.SFC IS NOT NULL THEN '质量异常'
+        ELSE '外协质量异常'
+        END ABNORMAL_TYPE
         FROM Z_ABNORMAL_BILL zab
                  INNER JOIN Z_ABNORMAL_BILL_DISPOSE zabd ON zab.HANDLE = zabd.ABNORMAL_BILL_BO
                  LEFT JOIN Z_ABNORMAL_NC_CODE zanc ON zab.HANDLE = zanc.ABNORMAL_BILL_BO
@@ -487,8 +495,11 @@
                  LEFT JOIN CUSTOM_FIELDS itemNumber ON itemNumber.HANDLE = so.HANDLE AND itemNumber."ATTRIBUTE" = 'ITEM_NUMBER'
                  LEFT JOIN SFC s ON s.SFC = zab.SFC AND s.SITE = zab.SITE
 
-                LEFT JOIN Z_SFC_DISPATCH Szsd ON s.SFC = zab.SFC AND SUBSTR(Szsd.HANDLE,1,INSTR(Szsd.HANDLE,',',-1)-1) = SUBSTR(zabd.ROUTER_BO,1,INSTR(zabd.ROUTER_BO,',',-1)-1)
+                LEFT JOIN Z_SFC_DISPATCH Szsd ON s.SFC = zab.SFC AND SUBSTR(Szsd.ROUTER_BO,1,INSTR(Szsd.ROUTER_BO,',',-1)-1) = SUBSTR(zabd.ROUTER_BO,1,INSTR(zabd.ROUTER_BO,',',-1)-1)
+                LEFT JOIN OPERATION o2 ON o2.OPERATION = Szsd.OPERATION AND o2.SITE = Szsd.SITE AND o2.CURRENT_REVISION ='true'
+                LEFT JOIN OPERATION_T ot2 ON ot2.OPERATION_BO = o2.HANDLE AND ot2.LOCALE = 'zh'
                 LEFT JOIN RESRCE RES ON RES.RESRCE = Szsd.RESRCE AND Szsd.SITE = RES.SITE
+                LEFT JOIN RESOURCE_TYPE rt2 ON rt2.RESOURCE_TYPE = Szsd.RESOURCE_TYPE AND rt2.SITE = Szsd.SITE
                 LEFT JOIN CUSTOM_FIELDS CFPT ON CFPT."ATTRIBUTE" = 'PRICE_TIME' AND CFPT.HANDLE = RES.HANDLE
 
                  LEFT JOIN SFC_ROUTING SR ON SR.SFC_BO  = S.HANDLE
@@ -530,15 +541,15 @@
             </if>
         </where>
         GROUP BY zab.CREATED_DATE_TIME ,zab.ABNORMAL_NO ,CFPT.VALUE,
-                 i.ITEM  ,it.DESCRIPTION ,itemNumber.VALUE ,zab.ITEM_NUMBER,
-                 mapNo.VALUE ,zab.PB_DESCRIPTION ,zsd.EMPLOYEE_DESCRIPTION ,
-                 zab."TYPE" ,zab.REPORT_SEND_USER_GROUP  ,zabd.DUTY_DEPART ,zabd.PRINCIPAL_USER,
-                 zab.PB_GRADE,zabd.DUTY_CAUSE_DESCRIPTION ,zabd.BEFORE_MEASURE,ABNORMAL_METHOD,
-                 zabd.RESOLVE_REMARK ,zabd.RESOLVE_USER ,
-                 zabd.CLOSED_DATE_TIME ,zab.NC_QTY ,zab.PB_QTY ,zab.SHOP_ORDER,so.QTY_TO_BUILD,
-                 zsd.EMPLOYEE_DESCRIPTION  ,ot.DESCRIPTION  ,
-                 r2.RESRCE,r2.DESCRIPTION,zsd.RESOURCE_TYPE,
-                 rt.DESCRIPTION, dflt.DATA_TAG,zabd.DUTY_CAUSE_TYPE,zabd.DUTY_TYPE ,zabd.DUTY_DEPART,zab.SFC,
+        i.ITEM  ,it.DESCRIPTION ,itemNumber.VALUE ,zab.ITEM_NUMBER,
+        mapNo.VALUE ,zab.PB_DESCRIPTION ,zsd.EMPLOYEE_DESCRIPTION ,
+        zab."TYPE" ,zab.REPORT_SEND_USER_GROUP  ,zabd.DUTY_DEPART ,zabd.PRINCIPAL_USER,
+        zab.PB_GRADE,zabd.DUTY_CAUSE_DESCRIPTION ,zabd.BEFORE_MEASURE,ABNORMAL_METHOD,
+        zabd.RESOLVE_REMARK ,zabd.RESOLVE_USER ,Szsd.RESOURCE_TYPE,
+        zabd.CLOSED_DATE_TIME ,zab.NC_QTY ,zab.PB_QTY ,zab.SHOP_ORDER,so.QTY_TO_BUILD,
+        zsd.EMPLOYEE_DESCRIPTION  ,ot.DESCRIPTION  ,RES.RESRCE,RES.DESCRIPTION,
+        r2.RESRCE,r2.DESCRIPTION,zsd.RESOURCE_TYPE,ot2.DESCRIPTION,rt2.DESCRIPTION,
+        rt.DESCRIPTION, dflt.DATA_TAG,zabd.DUTY_CAUSE_TYPE,zabd.DUTY_TYPE ,zabd.DUTY_DEPART,zab.SFC,
         znu.FULL_NAME,znu2.FULL_NAME,zab.RESPONSE_DATE_TIME,dflt2.DATA_TAG,Szsd.HANDLE, Szsd.PROD_HOURS
         ORDER BY zab.CREATED_DATE_TIME DESC
     </select>
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/UserService.java b/common/src/main/java/com/foreverwin/mesnac/common/service/UserService.java
index f03c422d..83d596e9 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/UserService.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/UserService.java
@@ -15,4 +15,7 @@ public interface UserService {
     List<UsrDto> findList(String user);
 
     IPage findPage(IPage page,String user);
+
+    IPage findAllUserPage(IPage page,String user);
+
 }
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java
index bf63e8ed..88d0b8a6 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/UserResourceController.java
@@ -190,4 +190,9 @@ public class UserResourceController {
         return R.ok(userService.findPage(frontPage.getPagePlus(), globalQuery));
     }
 
+    @GetMapping("/findAllUserPage")
+    public R findAllUserPage(FrontPage frontPage) {
+        String globalQuery = frontPage.getGlobalQuery();
+        return R.ok(userService.findAllUserPage(frontPage.getPagePlus(), globalQuery));
+    }
 }
\ No newline at end of file
diff --git a/listener/src/main/java/com/foreverwin/mesnac/listener/mapper/UsrMapper.java b/listener/src/main/java/com/foreverwin/mesnac/listener/mapper/UsrMapper.java
index 6bfb02ca..e15bacbb 100644
--- a/listener/src/main/java/com/foreverwin/mesnac/listener/mapper/UsrMapper.java
+++ b/listener/src/main/java/com/foreverwin/mesnac/listener/mapper/UsrMapper.java
@@ -28,6 +28,8 @@ public interface UsrMapper extends BaseMapper<Usr> {
 
     IPage findPage(IPage page,@Param("site")String site,@Param("user")String user);
 
+    IPage findAllUserPage(IPage page,@Param("site")String site,@Param("user")String user);
+
     List<String> findCustomFieldByUserId(@Param("site")String site, @Param("userList")List<NwaUser> userList);
 
 
diff --git a/listener/src/main/java/com/foreverwin/mesnac/listener/service/impl/UsrServiceImpl.java b/listener/src/main/java/com/foreverwin/mesnac/listener/service/impl/UsrServiceImpl.java
index 6b752c5b..567f2551 100644
--- a/listener/src/main/java/com/foreverwin/mesnac/listener/service/impl/UsrServiceImpl.java
+++ b/listener/src/main/java/com/foreverwin/mesnac/listener/service/impl/UsrServiceImpl.java
@@ -64,12 +64,11 @@ public class UsrServiceImpl extends ServiceImpl<UsrMapper, Usr> implements UsrSe
         return usrMapper.findPage(page,site,user);
     }
 
-  /*  @Override
-    public List<Usr> userList(Usr user) {
+    @Override
+    public IPage findAllUserPage(IPage page, String user) {
         String site = CommonMethods.getSite();
-        String user1 = CommonMethods.getUser();
-        user.setSite(site);
-        return usrMapper.userList(user);
-    }*/
+        return usrMapper.findAllUserPage(page,site,user);
+    }
+
 
 }
\ No newline at end of file
diff --git a/listener/src/main/resources/mapper/UsrMapper.xml b/listener/src/main/resources/mapper/UsrMapper.xml
index ab8e1af8..783b30f8 100644
--- a/listener/src/main/resources/mapper/UsrMapper.xml
+++ b/listener/src/main/resources/mapper/UsrMapper.xml
@@ -642,6 +642,29 @@
         AND ZNU.DEL_FLAG = 'N'
     </select>
 
+    <select id="findAllUserPage" resultMap="usrDto">
+        SELECT U.USER_ID USER_NAME,ZNU.FULL_NAME FULL_NAME
+        FROM USR U
+        INNER JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = U.USER_ID
+        WHERE U.SITE=#{site}
+        <if test="user != null and user != ''">
+            AND (
+            U.USER_ID LIKE UPPER('%${user}%')
+            OR ZNU.FULL_NAME LIKE UPPER('%${user}%')
+            )
+        </if>
+        AND ZNU.DEL_FLAG = 'N'
+        UNION
+        SELECT DISTINCT USER_ID USER_NAME,USER_DESCRIPTION FULL_NAME FROM Z_USER_RESOURCE
+        WHERE SITE=#{site} AND  TEMPORARY_USER='true'
+        <if test="user != null and user != ''">
+            AND (
+            USER_ID LIKE UPPER('%${user}%')
+            OR USER_DESCRIPTION LIKE UPPER('%${user}%')
+            )
+        </if>
+    </select>
+
     <select id="findCustomFieldByUserId" resultType="String">
         SELECT cf.VALUE WECHAT_ID
         FROM USR u