From ec08a42903bc8967f177bee0a3c7a048f26edbf2 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期三, 27 七月 2022 10:43:02 +0800
Subject: [PATCH] 更新工作流
---
src/main/java/com/whyc/service/DocUserService.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/DocUserService.java b/src/main/java/com/whyc/service/DocUserService.java
index 1082e56..84e25a2 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;
@@ -38,6 +40,12 @@
@Autowired
private DocFaceService faceService;
+
+ @Autowired
+ private DocRoleService roleService;
+
+ @Autowired
+ private DocDepartService departService;
//鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
public Response getAllUser(DocUser docUser, int pageCurr, int pageSize) {
@@ -138,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) {
--
Gitblit v1.9.1