|
|
|
@ -40,7 +40,20 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public ModelAndView getInfo(String userID) {
|
|
|
|
|
ModelAndView mav = super.getInfo(userID);
|
|
|
|
|
|
|
|
|
|
ModelAndView mav = new ModelAndView();
|
|
|
|
|
|
|
|
|
|
boolean json = !isEmpty(userID) && jsonResponse();
|
|
|
|
|
String viewName = json ? "jsonView" : "base/user/user-info";
|
|
|
|
|
|
|
|
|
|
if (!isEmpty(userID)) {
|
|
|
|
|
DataObject userInfo = userService.getUserInfo(userID);
|
|
|
|
|
mav.setViewName(viewName);
|
|
|
|
|
mav.addObject("userInfo", json ? userInfo : toJson(userInfo));
|
|
|
|
|
} else {
|
|
|
|
|
mav.setViewName("base/user/user-info");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mav.addObject("allOgdpList", fimsOgdpBean.selectAllOgdpList());
|
|
|
|
|
|
|
|
|
|