From b848451e8889fea12ce40b7818c1b8d84b50ea02 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 01 九月 2022 13:41:07 +0800
Subject: [PATCH] 权限管理组合操作

---
 src/main/java/com/whyc/service/DocUserService.java |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/whyc/service/DocUserService.java b/src/main/java/com/whyc/service/DocUserService.java
index 48bb8fb..bdfd5d0 100644
--- a/src/main/java/com/whyc/service/DocUserService.java
+++ b/src/main/java/com/whyc/service/DocUserService.java
@@ -9,6 +9,8 @@
 import com.whyc.dto.Page;
 import com.whyc.dto.Response;
 import com.whyc.mapper.DocUserMapper;
+import com.whyc.pojo.DocDepart;
+import com.whyc.pojo.DocRole;
 import com.whyc.pojo.DocUser;
 import com.whyc.util.ActionUtil;
 import com.whyc.util.RSAUtil;
@@ -25,7 +27,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static com.whyc.util.ActionUtil.createFilefolderIFNotExist;
 
@@ -36,6 +40,12 @@
 
     @Autowired
     private DocFaceService faceService;
+
+    @Autowired
+    private DocRoleService roleService;
+
+    @Autowired
+    private DocDepartService departService;
 
     //鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
     public Response getAllUser(DocUser docUser, int pageCurr, int pageSize) {
@@ -55,6 +65,7 @@
         wrapper.set("depart_id",docUser.getDepartId());
         wrapper.set("face_id",faceId);
         wrapper.set("role_id",docUser.getRoleId());
+        wrapper.set("dload_flag",docUser.getDloadFlag());
         wrapper.eq("id",docUser.getId());
         int bl=mapper.update(null,wrapper);
         return new Response().set(1,bl>0?true:false);
@@ -135,7 +146,14 @@
         DocUser userDB = (DocUser) subject.getPrincipal();
         userDB.setSnId(null);
         request.getSession().setAttribute("user", userDB);
-        return response.setII(1,true, userDB,"鐧诲綍鎴愬姛");
+        //鏌ヨ瑙掕壊鍜岄儴闂ㄥ垪琛ㄤ俊鎭�
+        Map<String,Object> map = new HashMap<>();
+        List<DocDepart> departList = (List<DocDepart>) ((PageInfo)departService.getAllDepart().getData2()).getList();
+        List<DocRole> roleList = (List<DocRole>)  ((PageInfo)roleService.getAllRole().getData2()).getList();
+        map.put("departs",departList);
+        map.put("roles",roleList);
+
+        return response.setIII(1,true, userDB,map,"鐧诲綍鎴愬姛");
     }
     //淇敼瀵嗙爜
     public Response changeSnId(String name,String oldSnId, String newSnId) {
@@ -160,4 +178,17 @@
             return new Response().set(1,false,"淇敼澶辫触");
         }
     }
+    //鏍规嵁瑙掕壊id鏌ヨ瀵瑰簲鐨勭敤鎴�
+    public Response getUserByRoleId(int roleId) {
+        QueryWrapper wrapper=new QueryWrapper();
+        wrapper.eq("role_id",roleId);
+        wrapper.select("id","name");
+        List<DocUser> list=mapper.selectList(wrapper);
+        return new Response().setII(1,list.size()>0?true:false,list,"杩斿洖鏁版嵁");
+    }
+    //鏌ヨ鎵�鏈夌敤鎴�(鏉冮檺绠$悊鐢�)
+    public Response getAllDocUser() {
+        List<DocUser> list=mapper.getAllDocUser();
+        return new Response().setII(1,list!=null?true:false,list,"鏁版嵁杩斿洖");
+    }
 }

--
Gitblit v1.9.1