Merge branch 'dev' of https://gitea.anxinyun.cn/free-sun/Highways4Good into dev

weapp/src/packages/patrol/index.jsx

@@ -1443,8 +1443,7 @@ const Index = () => {
           {
             isSuperAdmin && (wait === 'wait' || kind === 'handle') && <View className='appoint'>
               {
-                handleState === '待处理' ? // 管理员指派
-                  <>
+                handleState === '待处理' && <>
                   <RadioGroup onChange={(e) => {
                     setIsAppoint(e.detail.value === '指派' ? true : false)
                   }}>
@@ -1474,22 +1473,6 @@ const Index = () => {
                     </>
                   }
                 </>
-                  : // 管理员查看
-                  <>
-                    {/* {
-                      handleState === '不处理' && <Text>
-                        处理结果：暂不进行处理
-                      </Text>
-                    } */}
-                    {/* {
-                      (handleState === '已指派' || handleState === '已处理') && <>
-                        <View>处理意见：</View>
-                        <View>{handleAdvice}</View>
-                        <View style={{ marginTop: 10 }}>责任人：</View>
-                        <View>{appointUser !== null ? allDepUsers.find(d => d.depId === userList[appointUser]?.departmentId)?.depName : ''}-{appointUser !== null ? userList[appointUser]?.name : ''}</View>
-                      </>
-                    } */}
-                  </>
               }
             </View>
           }
@@ -1510,7 +1493,11 @@ const Index = () => {
               {
                 (isSuperAdmin && (handleState === '已指派' || handleState === '已处理')) && <>
                   <View style={{ marginTop: 10 }}>责任人：</View>
-                  <View>{appointUser !== null ? allDepUsers.find(d => d.depId === userList[appointUser]?.departmentId)?.depName : ''}-{appointUser !== null ? userList[appointUser]?.name : ''}</View>
+                  <View>
+                    {appointUser !== null ? allDepUsers.find(d => d.depId === userList.find(u => u.id === appointUser)?.departmentId)?.depName : ''}
+                    -
+                    {appointUser !== null ? userList.find(u => u.id === appointUser)?.name : ''}
+                  </View>
                 </>
               }
             </View>