Pārlūkot izejas kodu

公司认证,发布职位

Your Name 8 mēneši atpakaļ
vecāks
revīzija
cd794f015e

+ 16 - 15
src/main/java/com/sqx/modules/app/controller/app/AppController.java

@@ -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);
 
     }

+ 1 - 3
src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -889,14 +889,12 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
         UserEntity userEntity = baseMapper.selectById(userId);
         if (userEntity != null) {
             if (userEntity.getUserType() == 2) {
-                Company company = companyService.getOne(new QueryWrapper<Company>().eq("user_id", userEntity.getUserId()));
+                Company company = companyService.getOne(new QueryWrapper<Company>().eq("user_id", userEntity.getUserId()).eq("status",2));
                 if (company != null) {
                     userEntity.setCompanyId(company.getCompanyId());
                 }
             }
         }
-
-
         return userEntity;
     }
 

+ 1 - 0
src/main/java/com/sqx/modules/firstLogin/entity/HrEntity.java

@@ -16,5 +16,6 @@ public class HrEntity implements Serializable {
     private  Integer userId;
     private  String  hrImg;
     private  String  hrPosition;
+    private  String  hrEmail;
 
 }