|
@@ -64,10 +64,10 @@ public class UserOpenController {
|
|
@RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
|
|
@RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
|
|
List<UserRole> list = new ArrayList<>();
|
|
List<UserRole> list = new ArrayList<>();
|
|
if (userId == 0) {
|
|
if (userId == 0) {
|
|
-// UserOpen userOpen = homeService.getUserOpen();
|
|
|
|
-// list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
|
|
|
|
- list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
|
|
|
|
- UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
|
|
|
|
|
|
+ UserOpen userOpen = homeService.getUserOpen();
|
|
|
|
+ list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
|
|
|
|
+// list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
|
|
|
|
+// UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
|
|
userId = userOpen.getUserId();
|
|
userId = userOpen.getUserId();
|
|
model.put("user", userOpen);
|
|
model.put("user", userOpen);
|
|
model.put("user_id", "\"" + userOpen.getUserId() + "\"");
|
|
model.put("user_id", "\"" + userOpen.getUserId() + "\"");
|
|
@@ -129,7 +129,7 @@ public class UserOpenController {
|
|
return new ModelAndView("/user/home.ftl", model);
|
|
return new ModelAndView("/user/home.ftl", model);
|
|
}
|
|
}
|
|
if (list.size() == 1) {
|
|
if (list.size() == 1) {
|
|
- return new ModelAndView("/tuangou/home.html", model);
|
|
|
|
|
|
+ return new ModelAndView("/tuangou/home.ftl", model);
|
|
}
|
|
}
|
|
if (list.size() == 2) {
|
|
if (list.size() == 2) {
|
|
model.put("type", 2);
|
|
model.put("type", 2);
|
|
@@ -139,7 +139,7 @@ public class UserOpenController {
|
|
model.put("user", userOpenMapper.selectByUserId(userId));
|
|
model.put("user", userOpenMapper.selectByUserId(userId));
|
|
model.put("user_id", "\"" + userId + "\"");
|
|
model.put("user_id", "\"" + userId + "\"");
|
|
if (userType == 1) {
|
|
if (userType == 1) {
|
|
- return new ModelAndView("/tuangou/home.html", model);
|
|
|
|
|
|
+ return new ModelAndView("/tuangou/home.ftl", model);
|
|
} else if (userType == 2) {
|
|
} else if (userType == 2) {
|
|
model.put("type", 2);
|
|
model.put("type", 2);
|
|
return new ModelAndView("/user/changeRole.ftl", model);
|
|
return new ModelAndView("/user/changeRole.ftl", model);
|