diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
index e3289c5..fe49ecb 100644
--- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java
@@ -1120,6 +1120,13 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         userEntity.setUpdateTime(sdf.format(new Date()));
         baseMapper.updateById(userEntity);
+
+
+        Artificer artificer = artificerService.selectArtificerByUserId(userEntity.getUserId());
+        if(artificer!=null){
+            userEntity.setArtificerId(artificer.getArtificerId());
+        }
+
         return getResult(userEntity);
 
     }
diff --git a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java
index c7726c9..0418827 100644
--- a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java
+++ b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java
@@ -344,6 +344,9 @@ public class AppArtificerController {
     @GetMapping(value = "selectArtificerMassage")
     public Result selectArtificerMassage(@RequestAttribute Long userId, Integer page, Integer limit, Integer status){
         Artificer artificer = artificerService.selectArtificerByUserId(userId);
+        if(artificer == null){
+            return Result.success();
+        }
         return artificerMassageService.selectArtificerMassage(artificer.getArtificerId(), page, limit, status);
     }
 
@@ -352,6 +355,9 @@ public class AppArtificerController {
     @GetMapping(value = "selectArtificerIndex")
     public Result selectArtificerIndex(@RequestAttribute Long userId,String startTime,String endTime){
         Artificer artificer = artificerService.selectArtificerByUserId(userId);
+        if(artificer == null){
+            return Result.success();
+        }
         return ordersService.selectArtificerIndex(artificer.getArtificerId(),startTime,endTime);
     }
 
@@ -382,6 +388,9 @@ public class AppArtificerController {
     @ApiOperation("技师收益")
     public Result selectArtificerMoney(@RequestAttribute Long userId){
         Artificer artificer = artificerService.selectArtificerByUserId(userId);
+        if(artificer == null){
+            return Result.success();
+        }
         return artificerService.selectArtificerMoney(userId,artificer.getArtificerId());
     }