Merge remote-tracking branch 'origin/master'

Backend/sample/src/main/java/com/dji/sample/manage/controller/UserController.java

@@ -77,18 +77,17 @@ public class UserController {
         return userService.saveApiUser(clientId,username, password);
     }
 
-    @PostMapping("/savePilotUser")
-    public HttpResultResponse savePilotUser(HttpServletRequest request,@RequestBody UserPilotDTO pilotDTO) {
+    @PostMapping("/{workspace_id}/savePilotUser")
+    public HttpResultResponse savePilotUser(HttpServletRequest request,@RequestBody UserPilotDTO pilotDTO,@PathVariable("workspace_id") String workspaceId) {
         String username = pilotDTO.getUsername();
         String password = pilotDTO.getPassword();
-        String workspaceId = pilotDTO.getWorkspaceId();
         log.info("==========savePilotUser接口调用  username:" + username + ",password:" + password + ",workspaceId:" + workspaceId + ",IP:" + request.getRemoteAddr());
         return userService.savePilotUser(username, password,workspaceId);
     }
 
     @GetMapping("/getPwd")
     public HttpResultResponse getPwd(@NotNull String userId) {
-        log.info("==========getPwd接口调用  username:" + userId );
+        log.info("==========getPwd接口调用  userId:" + userId );
         return userService.getPwd(userId);
     }
 

Backend/sample/src/main/java/com/dji/sample/manage/service/impl/UserServiceImpl.java

@@ -513,7 +513,9 @@ public class UserServiceImpl implements IUserService {
 
     @Override
     public HttpResultResponse getPwd(String userId) {
-        UserEntity userEntity = mapper.selectById(userId);
+        QueryWrapper<UserEntity>  wrapper = new QueryWrapper<>();
+        wrapper.lambda().eq(UserEntity::getUserId,userId);
+        UserEntity userEntity = mapper.selectOne(wrapper);
         if (userEntity == null) {
             return new HttpResultResponse()
                     .setCode(HttpStatus.BAD_REQUEST.value())