From 05fcd33a7d4bed53ab9b253ea7878aa699223176 Mon Sep 17 00:00:00 2001
From: longyvfengyun <496960745@qq.com>
Date: 星期三, 27 七月 2022 10:49:46 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager
---
src/main/java/com/whyc/service/DocUserService.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/DocUserService.java b/src/main/java/com/whyc/service/DocUserService.java
index 3f4dabd..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;
@@ -39,6 +41,12 @@
@Autowired
private DocFaceService faceService;
+ @Autowired
+ private DocRoleService roleService;
+
+ @Autowired
+ private DocDepartService departService;
+
//鏌ヨ鎵�鏈夌敤鎴蜂俊鎭�
public Response getAllUser(DocUser docUser, int pageCurr, int pageSize) {
PageHelper.startPage(pageCurr,pageSize);
@@ -57,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);
@@ -137,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