diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java index a1084d10..4bae85a6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/api/PortalConsoleApi.java @@ -100,6 +100,7 @@ public class PortalConsoleApi extends ApiBaseController{ map.put("name",user.getName()); map.put("sex",user.getGender()); map.put("userNo",user.getUserNo()); + map.put("showHome",user.getShowHome()==null? true:user.getShowHome()); map.put("userType",utype); map.put("departId",user.getDepartId()); map.put("sign",user.getSign()); diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java index fafccf11..c81d6ce6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/UserApi.java @@ -7,10 +7,15 @@ import java.util.Map; import javax.annotation.Resource; -import com.xboe.system.user.vo.UserAccountVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import com.xboe.account.entity.Account; import com.xboe.account.service.IAccountService; @@ -29,7 +34,6 @@ import com.xboe.system.user.service.IUserService; import com.xboe.system.user.vo.UserSimpleVo; import com.xboe.system.user.vo.UserVo; - import lombok.extern.slf4j.Slf4j; /**