Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/model/dto/ResponsibilitySaveDTO.java

@@ -32,11 +32,11 @@ public class ResponsibilitySaveDTO {
     @ApiModelProperty(name = "responsibilityType",value = "收益类型 1. 收费中心，2.成本(费用)中心")
     private Integer responsibilityType;
 
-    @NotNull(message = "分摊级别不能为空")
+//    @NotNull(message = "分摊级别不能为空")
     @ApiModelProperty(name = "shareLevel",value = "分摊级别（分摊接口中获取，暂时可写死）")
     private Integer shareLevel;
 
-    @NotNull(message = "分摊级别名称不能为空")
+//    @NotNull(message = "分摊级别名称不能为空")
     @ApiModelProperty(name = "shareName",value = "分摊级别名称（分摊接口中获取，暂时可写死）")
     private String shareName;
 

src/main/java/com/imed/costaccount/model/vo/LoginVO.java

@@ -15,4 +15,8 @@ public class LoginVO {
 
     @ApiModelProperty(name = "token",value = "登录返回jwt字符串")
     private String token;
+    @ApiModelProperty(name = "userid",value = "登录返回用户Id")
+    private Integer userid;
+    @ApiModelProperty(name = "name",value = "登录返回用户名称")
+    private String name;
 }

src/main/java/com/imed/costaccount/service/impl/ResponsibilityServiceImpl.java

@@ -87,8 +87,9 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         }
 
         Responsibility center = BeanUtil.convertObj(responsibilitySaveDTO, Responsibility.class);
-        center.setCreateTime(new Date().getTime()).setId(null).setParentId(id);
+        center.setCreateTime(new Date().getTime()).setId(null).setParentId(id).setHospId(user.getHospId());
         if (id == 0) {
+            center.setResponsibilityLevel(1);
             center.setShareLevel(0);
             center.setShareName("");
         }

src/main/java/com/imed/costaccount/service/impl/UserServiceImpl.java

@@ -80,7 +80,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         }
         String token = jwtUtil.createToken(one.getId());
 
-        return LoginVO.builder().token(token).build();
+        return LoginVO.builder().token(token).name(one.getName()).userid(one.getId()).build();
     }
 
     /**