Commit d7d5b6e1 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.4' into MVP1.4

parents b59379cd 1412cef4
...@@ -187,7 +187,7 @@ public class TBusDeptController { ...@@ -187,7 +187,7 @@ public class TBusDeptController {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user != null && user.getId() != null) { if (user != null && user.getId() != null) {
tBusDept.setCreateTime(LocalDateTime.now()); tBusDept.setCreateTime(LocalDateTime.now());
tBusDept.setCreateUserId(String.valueOf(user.getId())); tBusDept.setCreateUserId(user.getId());
tBusDept.setCreateUserName(user.getNickname()); tBusDept.setCreateUserName(user.getNickname());
tBusDept.setLevel(parentDept.getLevel() + CommonConstants.ONE_INT); tBusDept.setLevel(parentDept.getLevel() + CommonConstants.ONE_INT);
tBusDeptService.save(tBusDept); tBusDeptService.save(tBusDept);
...@@ -300,7 +300,7 @@ public class TBusDeptController { ...@@ -300,7 +300,7 @@ public class TBusDeptController {
String error; String error;
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user == null || user.getId() == null) { if (user == null || Common.isEmpty(user.getId())) {
return R.failed("未获取到登录人信息!"); return R.failed("未获取到登录人信息!");
} }
String userId = String.valueOf(user.getId()); String userId = String.valueOf(user.getId());
......
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