|
|
@@ -49,7 +49,8 @@ public class AppController {
|
|
|
@Login
|
|
|
@PostMapping("/updateUserResumes")
|
|
|
@ApiOperation("修改用户")
|
|
|
- public Result updateUserResumes( @RequestBody UserEntity user, String resumesContent) {
|
|
|
+ public Result updateUserResumes( @RequestBody UserEntity user, String resumesContent,@RequestAttribute("userId")Long userId) {
|
|
|
+ user.setUserId(userId);
|
|
|
userService.updateById(user);
|
|
|
MessageInfo messageInfo = new MessageInfo();
|
|
|
messageInfo.setState("10");
|
|
|
@@ -139,20 +140,20 @@ public class AppController {
|
|
|
@RequestMapping(value = "/selectUserById", method = RequestMethod.GET)
|
|
|
@ApiOperation("获取用户详细信息")
|
|
|
@ResponseBody
|
|
|
- public Result selectUserById(@LoginUser UserEntity user) {
|
|
|
- if (user.getUserType() == 2) {
|
|
|
- Company company = companyService.getOne(new QueryWrapper<Company>().eq("user_id", user.getUserId()));
|
|
|
- if (company != null) {
|
|
|
- user.setCompanyId(company.getCompanyId());
|
|
|
- }
|
|
|
- }
|
|
|
- if (user.getZhiRate() == null) {
|
|
|
- user.setZhiRate(new BigDecimal(commonInfoService.findOne(207).getValue()));
|
|
|
- }
|
|
|
- if (user.getFeiRate() == null) {
|
|
|
- user.setFeiRate(new BigDecimal(commonInfoService.findOne(208).getValue()));
|
|
|
- }
|
|
|
- userService.updateById(user);
|
|
|
+ public Result selectUserById(@RequestAttribute("userId")Long userId) {
|
|
|
+// if (user.getUserType() == 2) {
|
|
|
+// Company company = companyService.getOne(new QueryWrapper<Company>().eq("user_id", user.getUserId()));
|
|
|
+// if (company != null) {
|
|
|
+// user.setCompanyId(company.getCompanyId());
|
|
|
+// }
|
|
|
+// }
|
|
|
+// if (user.getZhiRate() == null) {
|
|
|
+// user.setZhiRate(new BigDecimal(commonInfoService.findOne(207).getValue()));
|
|
|
+// }
|
|
|
+// if (user.getFeiRate() == null) {
|
|
|
+// user.setFeiRate(new BigDecimal(commonInfoService.findOne(208).getValue()));
|
|
|
+// }
|
|
|
+ UserEntity user = userService.selectUserById(userId);
|
|
|
return Result.success().put("data", user);
|
|
|
|
|
|
}
|