Merge branches 'dev' and 'dev' of https://gitea.anxinyun.cn/free-sun/OperationalService into dev

web/client/src/sections/workOrder/containers/aboutMe.jsx

@@ -49,19 +49,19 @@ const Rest = (props) => {
                }
             })
             setTableData(nextTableData)
-            setLimits(nextTableData?.length || 0)
+            // setLimits(nextTableData?.length || 0)
             setLoading(false)
          }, error => {
             Toast.error({ content: '抄送我的工单列表请求失败', duration: 1, })
             setLoading(false)
          });
-      // EmisRequest.get(EmisApiTable.processInstancemMyNoticeCount,
-      //    { userId: user?.id, businessType: '运维中台工单', ...obj, limit: "", offset: "" })
-      //    .then(res => {
-      //       setLimits(res.count || 0)
-      //    }, error => {
-      //       Toast.error({ content: '抄送我的工单数量请求失败', duration: 1, })
-      //    });
+      EmisRequest.get(EmisApiTable.processInstancemMyNoticeCount,
+         { userId: user?.id, businessType: '运维中台表单', ...obj, limit: "", offset: "" })
+         .then(res => {
+            setLimits(res.count || 0)
+         }, error => {
+            Toast.error({ content: '抄送我的工单数量请求失败', duration: 1, })
+         });
    }
 
    let columns = [{

web/client/src/sections/workOrder/containers/receipt.jsx

@@ -47,24 +47,24 @@ const Rest = (props) => {
                   pomsNeedData
                }
             })
-            setLimits(nextTableData?.length || 0)
+            // setLimits(nextTableData?.length || 0)
             setTableData(nextTableData)
             setLoading(false)
          }, error => {
             Toast.error({ content: '已办工单列表请求失败', duration: 1, })
             setLoading(false)
          });
-      // EmisRequest.get(EmisApiTable.processInstancemMyDoneCount,
-      //    {
-      //       userId: user?.id,
-      //       businessType: '运维中台工单',
-      //       ...obj, limit: "", offset: ""
-      //    })
-      //    .then(res => {
-      //       setLimits(res.count || 0)
-      //    }, error => {
-      //       Toast.error({ content: '已办工单数量请求失败', duration: 1, })
-      //    });
+      EmisRequest.get(EmisApiTable.processInstancemMyDoneCount,
+         {
+            userId: user?.id,
+            businessType: '运维中台表单',
+            ...obj, limit: "", offset: ""
+         })
+         .then(res => {
+            setLimits(res.count || 0)
+         }, error => {
+            Toast.error({ content: '已办工单数量请求失败', duration: 1, })
+         });
    }
 
    let columns = [{