From 8b6ec86a1a1084869394cf23fc01787d5ced4c67 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Mon, 2 Nov 2020 12:09:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/app/controller/StaffRoleController.java |  5 +++++
 .../java/com/lz/modules/app/dto/StaffRoleInfo.java  |  2 +-
 .../java/com/lz/modules/app/model/RoleModel.java    |  3 ++-
 .../lz/modules/flow/service/StaffRoleService.java   |  2 ++
 .../flow/service/impl/StaffRoleServiceImpl.java     | 13 +++++++++++--
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java
index e498a7ed..ba64aa5d 100644
--- a/src/main/java/com/lz/modules/app/controller/StaffRoleController.java
+++ b/src/main/java/com/lz/modules/app/controller/StaffRoleController.java
@@ -210,5 +210,10 @@ public class StaffRoleController {
         return staffRoleService.selectRoleInfoBy(roleModel);
     }
 
+    // http://localhost:8080/lz_management/user/lzstaffrole/role/detail
+    @RequestMapping("/role/detail")
+    public R roleDetail(RoleModel roleModel) {
+        return staffRoleService.selectRoleDetail(roleModel);
+    }
 
 }
diff --git a/src/main/java/com/lz/modules/app/dto/StaffRoleInfo.java b/src/main/java/com/lz/modules/app/dto/StaffRoleInfo.java
index bd7e7c9d..f8853d50 100644
--- a/src/main/java/com/lz/modules/app/dto/StaffRoleInfo.java
+++ b/src/main/java/com/lz/modules/app/dto/StaffRoleInfo.java
@@ -15,5 +15,5 @@ public class StaffRoleInfo {
     //@ApiModelProperty(value = "0表示全部部门，1 所在部门及以下部门，2表示特定部门", name = "departmentId")
     private int canSee = 1;
     private List<String> menuNames;
-    private String  departmentLevel;
+    private Long id ;
 }
diff --git a/src/main/java/com/lz/modules/app/model/RoleModel.java b/src/main/java/com/lz/modules/app/model/RoleModel.java
index 6c53abcd..39e42667 100644
--- a/src/main/java/com/lz/modules/app/model/RoleModel.java
+++ b/src/main/java/com/lz/modules/app/model/RoleModel.java
@@ -4,7 +4,8 @@ import lombok.Data;
 
 @Data
 public class RoleModel {
-    private int currPage =1;
+    private int currPage = 1;
     private int pageSize = 10;
+    private Long id;
 
 }
diff --git a/src/main/java/com/lz/modules/flow/service/StaffRoleService.java b/src/main/java/com/lz/modules/flow/service/StaffRoleService.java
index 3d1fd67a..ff04943f 100644
--- a/src/main/java/com/lz/modules/flow/service/StaffRoleService.java
+++ b/src/main/java/com/lz/modules/flow/service/StaffRoleService.java
@@ -55,4 +55,6 @@ public interface StaffRoleService extends IService<StaffRole> {
 	List<StaffRole> selectStaffRolesByStaffId(List<Long> mIds);
 
     R selectRoleInfoBy(RoleModel roleModel);
+
+	R selectRoleDetail(RoleModel roleModel);
 }
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
index 23871fd2..4b1b2324 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleServiceImpl.java
@@ -6,6 +6,7 @@ import com.google.common.collect.Maps;
 import com.lz.common.utils.NumberUtil;
 import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.R;
+import com.lz.common.utils.StringUtil;
 import com.lz.modules.app.dao.DepartmentsDao;
 import com.lz.modules.app.dao.StaffDao;
 import com.lz.modules.app.dto.StaffRoleInfo;
@@ -292,8 +293,8 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
             StaffRoleInfo staffRoleInfo = new StaffRoleInfo();
             StaffEntity staffEntity = staffDao.selectStaffById(staffRole.getStaffId());
             staffRoleInfo.setName(staffEntity.getName());
-            staffRoleInfo.setDepartmentLevel(staffRole.getDepartmentLevel());
             staffRoleInfo.setHeaderUrl(staffEntity.getAvatar());
+            staffRoleInfo.setId(staffRole.getId());
             masterPM.add(staffRoleInfo);
         }
 
@@ -321,7 +322,7 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
         List<StaffRoleInfo> boss = new ArrayList<>();
         for (StaffRole staffRole : bossList) {
             StaffRoleInfo staffRoleInfo = new StaffRoleInfo();
-            staffRoleInfo.setDepartmentLevel(staffRole.getDepartmentLevel());
+            staffRoleInfo.setId(staffRole.getId());
             StaffEntity staffEntity = staffDao.selectStaffById(staffRole.getStaffId());
             staffRoleInfo.setName(staffEntity.getName());
             staffRoleInfo.setHeaderUrl(staffEntity.getAvatar());
@@ -334,4 +335,12 @@ public class StaffRoleServiceImpl extends ServiceImpl<StaffRoleMapper, StaffRole
         return R.ok().put("data", map);
     }
 
+    @Override
+    public R selectRoleDetail(RoleModel roleModel) {
+        if(roleModel.getId() == null){
+            return R.error("必需传入id");
+        }
+        return null;
+    }
+
 }