|
@@ -78,14 +78,11 @@ public class ApiUserController extends ApiBaseController {
|
|
*
|
|
*
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @RequestMapping(value = "/getCurrentUserDeparts", method = RequestMethod.GET)
|
|
|
|
|
|
+ @GetMapping(value = "/getCurrentUserDeparts")
|
|
public Result<Map<String, Object>> getCurrentUserDeparts() {
|
|
public Result<Map<String, Object>> getCurrentUserDeparts() {
|
|
LoginUser sysUser = sysUserService.getLoginUser(TokenUtil.getToken(request));
|
|
LoginUser sysUser = sysUserService.getLoginUser(TokenUtil.getToken(request));
|
|
- Result<Map<String, Object>> result = new Result<>();
|
|
|
|
Map<String, Object> map = sysUserService.getCurrentUserDeparts(sysUser);
|
|
Map<String, Object> map = sysUserService.getCurrentUserDeparts(sysUser);
|
|
- result.setResult(map);
|
|
|
|
- result.setSuccess(true);
|
|
|
|
- return result;
|
|
|
|
|
|
+ return Result.OK(map);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -94,16 +91,14 @@ public class ApiUserController extends ApiBaseController {
|
|
* @param user
|
|
* @param user
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- @RequestMapping(value = "/selectDepart", method = RequestMethod.PUT)
|
|
|
|
|
|
+ @PostMapping(value = "/selectDepart")
|
|
public Result<JSONObject> selectDepart(@RequestBody SysUser user) {
|
|
public Result<JSONObject> selectDepart(@RequestBody SysUser user) {
|
|
- Result<JSONObject> result = new Result<>();
|
|
|
|
String username = user.getUsername();
|
|
String username = user.getUsername();
|
|
if (oConvertUtils.isEmpty(username)) {
|
|
if (oConvertUtils.isEmpty(username)) {
|
|
LoginUser sysUser = sysUserService.getLoginUser(TokenUtil.getToken(request));
|
|
LoginUser sysUser = sysUserService.getLoginUser(TokenUtil.getToken(request));
|
|
username = sysUser.getUsername();
|
|
username = sysUser.getUsername();
|
|
}
|
|
}
|
|
JSONObject obj = sysUserService.updateSelectDept(user, username);
|
|
JSONObject obj = sysUserService.updateSelectDept(user, username);
|
|
- result.setResult(obj);
|
|
|
|
- return result;
|
|
|
|
|
|
+ return Result.OK(obj);
|
|
}
|
|
}
|
|
}
|
|
}
|