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

yifu-business/yifu-business-biz/src/main/java/com/yifu/cloud/plus/v1/business/controller/system/TBusDeptController.java

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