Merge branch 'dev'

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -176,6 +176,9 @@ public class SysUserController extends BaseController {
         Long projectId = LoginHelper.getProjectId();
         uoa.setProjectId(projectId);
         SysUserVo su = userService.selectUserById(uoa.getUserId());
+        if (su == null) {
+            return R.ok(uoa);
+        }
         if (su.getUserType().contains(SysUser.PROJECT_USER_TYPE)) {
             uoa.setStaffId(su.getCreateBy());
             su = userService.selectUserById(uoa.getStaffId());