Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
5642c7b70c
|
@ -23,8 +23,10 @@ public class ProjectController {
|
|||
|
||||
@GetMapping("/listAll")
|
||||
public List<Project> listAll() {
|
||||
// todo: 限制workspace和org
|
||||
return projectService.listAll();
|
||||
String currentWorkspaceId = SessionUtils.getCurrentWorkspaceId();
|
||||
ProjectRequest request = new ProjectRequest();
|
||||
request.setWorkspaceId(currentWorkspaceId);
|
||||
return projectService.getProjectList(request);
|
||||
}
|
||||
|
||||
@PostMapping("/add")
|
||||
|
|
|
@ -54,10 +54,10 @@
|
|||
data() {
|
||||
return {
|
||||
organizationList: [
|
||||
{ index: '7-1', name: '组织1'},
|
||||
{index: '7-1', name: '组织1'},
|
||||
],
|
||||
workspaceList: [
|
||||
{ index: '2-1', name: '无工作空间'},
|
||||
{index: '2-1', name: '无工作空间'},
|
||||
],
|
||||
currentUserInfo: {},
|
||||
currentUserId: JSON.parse(Cookies.get(TokenKey)).id,
|
||||
|
@ -98,7 +98,7 @@
|
|||
}
|
||||
},
|
||||
initMenuData() {
|
||||
this.$get("/organization/list/userorg/" + this.currentUserId,response => {
|
||||
this.$get("/organization/list/userorg/" + this.currentUserId, response => {
|
||||
this.organizationList = response.data;
|
||||
})
|
||||
this.$get("/workspace/list/userworkspace/" + this.currentUserId, response => {
|
||||
|
@ -119,7 +119,7 @@
|
|||
let user = {};
|
||||
user.id = this.currentUserInfo.id;
|
||||
user.lastSourceId = data.id;
|
||||
this.$post("/user/update", user);
|
||||
this.$post("/user/switch/source/" + user.lastSourceId, {});
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue