...

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/UserController.java

@@ -117,25 +117,19 @@ public class UserController extends ControllerSupport{
         }
     }
 
-    @ApiOperation(value = "更新用户", notes = "更新")
-    @PutMapping
-    public ResponseEntity updateUser(@RequestBody User user, HttpServletRequest request) {
-        cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
-        if (accessUser != null) {
-            if (accessUser.getRootOrgId() != 0) {
-                user.setRootOrgId(accessUser.getRootOrgId());
-            } else {
-                user.setRootOrgId(user.getOrgId());
-            }
-        } else {
-            return new ResponseEntity(HttpStatus.NOT_FOUND);
-        }
-        try {
-            return new ResponseEntity(userService.update(user.getId(), user), HttpStatus.OK);
-        } catch (Exception e) {
-            return new ResponseEntity(new ErrorMsg(e.getMessage()), HttpStatus.INTERNAL_SERVER_ERROR);
-        }
-    }
+	@ApiOperation(value = "更新用户", notes = "更新")
+	@PutMapping
+	public User updateUser(@RequestBody User user, HttpServletRequest request) {
+		cn.com.qmth.examcloud.commons.web.security.bean.User accessUser = getAccessUser();
+
+		if (accessUser.getRootOrgId() != 0) {
+			user.setRootOrgId(accessUser.getRootOrgId());
+		} else {
+			user.setRootOrgId(user.getOrgId());
+		}
+
+		return userService.update(user.getId(), user);
+	}
 
     @ApiOperation(value = "重置用户密码", notes = "重置密码")
     @PutMapping("/resetPass/{id}")