Skip to content

C
chnmuseum-party
Commit b3b7daaf authored by wzp's avatar wzp
Browse files
Options

修改用户

parent 942edddb
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TUserController.java
View file @ b3b7daaf
...@@ -225,7 +225,7 @@ public class TUserController extends BaseController { ...@@ -225,7 +225,7 @@ public class TUserController extends BaseController {
ew.eq("org_id", user.getOrgId()); ew.eq("org_id", user.getOrgId());
List<TUser> list = userService.list(ew); List<TUser> list = userService.list(ew);
if (list.size()>=3) { if (list.size()>=3) {
resultMap.put("resultCode", 400); resultMap.put("resultCode", 200);
resultMap.put("message", "机构已存在三个单位管理员！"); resultMap.put("message", "机构已存在三个单位管理员！");
return resultMap; return resultMap;
} }
...@@ -237,7 +237,7 @@ public class TUserController extends BaseController { ...@@ -237,7 +237,7 @@ public class TUserController extends BaseController {
ew.eq("user_name", user.getUserName()); ew.eq("user_name", user.getUserName());
TUser one = this.userService.getOne(ew); TUser one = this.userService.getOne(ew);
if (one != null) { if (one != null) {
resultMap.put("resultCode", 400); resultMap.put("resultCode", 200);
resultMap.put("message", "账号已存在！"); resultMap.put("message", "账号已存在！");
return resultMap; return resultMap;
} }
...@@ -622,7 +622,7 @@ public class TUserController extends BaseController { ...@@ -622,7 +622,7 @@ public class TUserController extends BaseController {
ew.eq("user_name", user.getUserName()); ew.eq("user_name", user.getUserName());
TUser one = this.userService.getOne(ew); TUser one = this.userService.getOne(ew);
if (one != null) { if (one != null) {
resultMap.put("resultCode", 400); resultMap.put("resultCode", 200);
resultMap.put("message", "账号已存在！"); resultMap.put("message", "账号已存在！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
} }
...@@ -662,7 +662,7 @@ public class TUserController extends BaseController { ...@@ -662,7 +662,7 @@ public class TUserController extends BaseController {
resultMap.put("message", "添加成功"); resultMap.put("message", "添加成功");
resultMap.put("data", user.getPassword()); resultMap.put("data", user.getPassword());
// 201 // 201
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap); return ResponseEntity.ok(resultMap);
} catch (Exception e) { } catch (Exception e) {
resultMap.put("resultCode", 500); resultMap.put("resultCode", 500);
resultMap.put("message", "服务器忙"); resultMap.put("message", "服务器忙");
...@@ -699,7 +699,7 @@ public class TUserController extends BaseController { ...@@ -699,7 +699,7 @@ public class TUserController extends BaseController {
ew.eq("user_name", user.getUserName()); ew.eq("user_name", user.getUserName());
TUser one = this.userService.getOne(ew); TUser one = this.userService.getOne(ew);
if (one != null) { if (one != null) {
resultMap.put("resultCode", 400); resultMap.put("resultCode", 200);
resultMap.put("message", "账号已存在！"); resultMap.put("message", "账号已存在！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
} }
...@@ -730,7 +730,7 @@ public class TUserController extends BaseController { ...@@ -730,7 +730,7 @@ public class TUserController extends BaseController {
resultMap.put("message", "添加成功"); resultMap.put("message", "添加成功");
resultMap.put("data", user.getPassword()); resultMap.put("data", user.getPassword());
// 201 // 201
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap); return ResponseEntity.ok(resultMap);
} catch (Exception e) { } catch (Exception e) {
resultMap.put("resultCode", 500); resultMap.put("resultCode", 500);
resultMap.put("message", "服务器忙"); resultMap.put("message", "服务器忙");
...@@ -743,7 +743,7 @@ public class TUserController extends BaseController { ...@@ -743,7 +743,7 @@ public class TUserController extends BaseController {
//新增 //新增
@OperationLog("新增统计账号") @OperationLog("新增统计账号")
@ApiOperation(value = "新增运维账号") @ApiOperation(value = "新增统计账号")
@RequestMapping(value = "/statisticsAdd", method = RequestMethod.POST) @RequestMapping(value = "/statisticsAdd", method = RequestMethod.POST)
@RequiresPermissions("/user/statisticsAdd") @RequiresPermissions("/user/statisticsAdd")
// @MethodLog(operModule = OperModule.USER, operType = OperType.ADD) // @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
...@@ -767,7 +767,7 @@ public class TUserController extends BaseController { ...@@ -767,7 +767,7 @@ public class TUserController extends BaseController {
ew.eq("user_name", user.getUserName()); ew.eq("user_name", user.getUserName());
TUser one = this.userService.getOne(ew); TUser one = this.userService.getOne(ew);
if (one != null) { if (one != null) {
resultMap.put("resultCode", 400); resultMap.put("resultCode", 200);
resultMap.put("message", "账号已存在！"); resultMap.put("message", "账号已存在！");
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap); return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
} }
...@@ -798,7 +798,7 @@ public class TUserController extends BaseController { ...@@ -798,7 +798,7 @@ public class TUserController extends BaseController {
resultMap.put("message", "添加成功"); resultMap.put("message", "添加成功");
resultMap.put("data", user.getPassword()); resultMap.put("data", user.getPassword());
// 201 // 201
return ResponseEntity.status(HttpStatus.CREATED).body(resultMap); return ResponseEntity.ok(resultMap);
} catch (Exception e) { } catch (Exception e) {
resultMap.put("resultCode", 500); resultMap.put("resultCode", 500);
resultMap.put("message", "服务器忙"); resultMap.put("message", "服务器忙");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment