From 93ae91ed44c592955c2281a95ec0cfdbdbeace95 Mon Sep 17 00:00:00 2001
From: philip <244793088@qq.com>
Date: Wed, 12 Jan 2022 13:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E8=B5=84=E6=BA=90=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=B4=E6=97=B6=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/dispatch/controller/UserResourceController.java | 6 +++++-
 .../mesnac/dispatch/mapper/UserResourceMapper.java         | 2 ++
 .../mesnac/dispatch/service/UserResourceService.java       | 2 ++
 .../dispatch/service/impl/UserResourceServiceImpl.java     | 7 +++++--
 dispatch/src/main/resources/mapper/UserResourceMapper.xml  | 7 +++++++
 5 files changed, 21 insertions(+), 3 deletions(-)

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 9000ec53..bf63e8ed 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
@@ -4,6 +4,7 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.foreverwin.mesnac.common.dto.UsrDto;
 import com.foreverwin.mesnac.common.service.UserService;
 import com.foreverwin.mesnac.dispatch.dto.UserResourceDto;
 import com.foreverwin.mesnac.dispatch.model.UserResource;
@@ -177,7 +178,10 @@ public class UserResourceController {
 
     @GetMapping("/findList")
     public R findList(String user){
-        return R.ok(userService.findList(user));
+        List<UsrDto> list = userService.findList(user);
+        List<UsrDto> temporaryUser =userResourceService.getTemporaryUser(user);
+        list.addAll(temporaryUser);
+        return R.ok(list);
     }
 
     @GetMapping("/findPage")
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
index 3d01bf33..d1e6702a 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/UserResourceMapper.java
@@ -1,6 +1,7 @@
 package com.foreverwin.mesnac.dispatch.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.foreverwin.mesnac.common.dto.UsrDto;
 import com.foreverwin.mesnac.dispatch.dto.UserResourceDto;
 import com.foreverwin.mesnac.dispatch.model.UserResource;
 import com.foreverwin.mesnac.meapi.model.NwaUser;
@@ -29,4 +30,5 @@ public interface UserResourceMapper extends BaseMapper<UserResource> {
     void deleteByUserAndResource(@Param("user")String user,@Param("resource")String resource);
 
 
+    List<UsrDto> getTemporaryUser(@Param("site") String site, @Param("user")String user);
 }
\ No newline at end of file
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
index 3fd1439e..1fb46338 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/UserResourceService.java
@@ -2,6 +2,7 @@ package com.foreverwin.mesnac.dispatch.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.foreverwin.mesnac.common.dto.UsrDto;
 import com.foreverwin.mesnac.dispatch.dto.UserResourceDto;
 import com.foreverwin.mesnac.dispatch.model.UserResource;
 import com.foreverwin.mesnac.meapi.model.NwaUser;
@@ -42,4 +43,5 @@ public interface UserResourceService extends IService<UserResource> {
      */
     void saveAll(List<UserResourceDto> userResourceDtoList,List<UserResource> deleteTableList);
 
+    List<UsrDto> getTemporaryUser(String user);
 }
\ No newline at end of file
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
index 44d235a6..7acf604c 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/UserResourceServiceImpl.java
@@ -4,6 +4,7 @@ import cn.hutool.core.lang.UUID;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.foreverwin.mesnac.common.dto.UsrDto;
 import com.foreverwin.mesnac.common.enums.HandleEnum;
 import com.foreverwin.mesnac.common.service.UserService;
 import com.foreverwin.mesnac.dispatch.dto.UserResourceDto;
@@ -193,8 +194,10 @@ public class UserResourceServiceImpl extends ServiceImpl<UserResourceMapper, Use
             }
         }
 
-
-
+    @Override
+    public List<UsrDto> getTemporaryUser(String user) {
+        return  userResourceMapper.getTemporaryUser(CommonMethods.getSite(),user);
+    }
 
 
 }
\ No newline at end of file
diff --git a/dispatch/src/main/resources/mapper/UserResourceMapper.xml b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
index 3c958109..b3070d92 100644
--- a/dispatch/src/main/resources/mapper/UserResourceMapper.xml
+++ b/dispatch/src/main/resources/mapper/UserResourceMapper.xml
@@ -489,6 +489,13 @@
                  LEFT JOIN Z_NWA_USER B ON A.SITE = B.SITE AND A.USER_ID = B.USER_NAME
         WHERE A.SITE = #{site} AND RT.RESOURCE_TYPE = #{resourceType}
     </select>
+    <select id="getTemporaryUser" resultType="com.foreverwin.mesnac.common.dto.UsrDto">
+        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 = #{user}
+        </if>
+    </select>
 
     <select id="findAll" resultMap="UserResourceDto">
         SELECT ROW_NUMBER() OVER(ORDER BY ZUR.RESRCE ASC) SEQ,ZUR.*,R.DESCRIPTION RESOURCE_DESCRIPTION