|
@@ -11,11 +11,13 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
|
11
|
11
|
import com.huiju.estateagents.center.sysUser.entity.SysUser;
|
12
|
12
|
import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
|
13
|
13
|
import com.huiju.estateagents.center.taUser.entity.TaUser;
|
|
14
|
+import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
|
14
|
15
|
import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
|
15
|
16
|
import com.huiju.estateagents.center.taUser.service.ITaUserService;
|
16
|
17
|
import com.huiju.estateagents.common.CommConstant;
|
17
|
18
|
import com.huiju.estateagents.common.JWTUtils;
|
18
|
19
|
import com.huiju.estateagents.common.MD5Utils;
|
|
20
|
+import com.huiju.estateagents.entity.SysButtonInMenu;
|
19
|
21
|
import com.huiju.estateagents.entity.SysMenu;
|
20
|
22
|
import com.huiju.estateagents.entity.TaPerson;
|
21
|
23
|
import com.huiju.estateagents.entity.TaRole;
|
|
@@ -27,6 +29,7 @@ import org.springframework.web.bind.annotation.*;
|
27
|
29
|
import sun.dc.pr.PRError;
|
28
|
30
|
|
29
|
31
|
import javax.servlet.http.HttpServletRequest;
|
|
32
|
+import javax.xml.ws.Response;
|
30
|
33
|
import java.time.LocalDateTime;
|
31
|
34
|
import java.util.HashMap;
|
32
|
35
|
import java.util.List;
|
|
@@ -58,6 +61,9 @@ public class TaUserController extends BaseController {
|
58
|
61
|
@Autowired
|
59
|
62
|
private ITaUserAuthMenuService iTaUserAuthMenuService;
|
60
|
63
|
|
|
64
|
+ @Autowired
|
|
65
|
+ private ITaUserAuthButtonService iTaUserAuthButtonService;
|
|
66
|
+
|
61
|
67
|
/**
|
62
|
68
|
* 分页查询列表
|
63
|
69
|
* @param pageNum
|
|
@@ -205,7 +211,9 @@ public class TaUserController extends BaseController {
|
205
|
211
|
TaUser taUser = iTaUserService.getById(map.get("userId").toString());
|
206
|
212
|
List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
|
207
|
213
|
ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString());
|
|
214
|
+ ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString());
|
208
|
215
|
taUser.setMenus((List<SysMenu>) authMenu.getData());
|
|
216
|
+ taUser.setButtons((List<SysButtonInMenu>) authButton.getData());
|
209
|
217
|
taUser.setRoles(roles);
|
210
|
218
|
taUser.setLoginPassword("");
|
211
|
219
|
|