From b283ca73d461452097a2b1b8fab9667e6b22d850 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan" <gao.zhiyuan@free-sun.com.cn>
Date: Thu, 13 Jul 2023 10:58:26 +0800
Subject: [PATCH] =?UTF-8?q?performerId=20=E4=BC=A0=E5=85=A5=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E4=B8=8D=E5=86=8D=E6=8C=89=E7=85=A7g?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E4=B8=8B=E5=85=A8=E9=83=A8=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/controllers/report/index.js |  1 +
 weapp/src/packages/patrol/index.jsx     | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/api/app/lib/controllers/report/index.js b/api/app/lib/controllers/report/index.js
index 1bfbed07..49f5ff41 100644
--- a/api/app/lib/controllers/report/index.js
+++ b/api/app/lib/controllers/report/index.js
@@ -13,6 +13,7 @@ async function reportList (ctx) {
             userInfo.loginSource == 'wx'
             && userInfo.isAdmin
             && userInfo.phone != 'SuperAdmin'
+            && (!performerId || !handleState)
         ) {
             // 是管理员但不是超管 查自己部门及下级部门的所有用户的信息
             const sqlStr = `
diff --git a/weapp/src/packages/patrol/index.jsx b/weapp/src/packages/patrol/index.jsx
index 91c409ea..daf2026d 100644
--- a/weapp/src/packages/patrol/index.jsx
+++ b/weapp/src/packages/patrol/index.jsx
@@ -228,7 +228,7 @@ const Index = () => {
     ])
   }, [reportType])
 
-  function report() {
+  function report () {
     if (!canReport) { return }
     if (
       (isPatrol && (!projectType || !road))
@@ -304,7 +304,7 @@ const Index = () => {
     })
   }
 
-  function deleteReport() {
+  function deleteReport () {
     Taro.showModal({
       title: '提示',
       content: '确定删除吗？',
@@ -331,7 +331,7 @@ const Index = () => {
     })
   }
 
-  function handleInput({ detail: { value } }, type) {
+  function handleInput ({ detail: { value } }, type) {
     switch (type) {
       case 'roadSectionStart':
         setRoadSectionStart(value)
@@ -363,15 +363,15 @@ const Index = () => {
     }
   }
 
-  function handleTypeChange(e) {
+  function handleTypeChange (e) {
     setReportType(e.detail.value)
   }
 
-  function handleImgChange(files, operationType, index, type) {
+  function handleImgChange (files, operationType, index, type) {
     if (operationType === 'remove') {
       setImg(false)
     }
-    function setImg(isAdd, url) {
+    function setImg (isAdd, url) {
       switch (type) {
         case 'scenePic':
           let nextImg = sceneImg
@@ -458,7 +458,7 @@ const Index = () => {
     }
   }
 
-  function handleImgClick(index, file) {
+  function handleImgClick (index, file) {
     Taro.previewImage({
       urls: [file.url] // 需要预览的图片http链接列表
     })