mozhe
/
mental-health-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复发布空指针bug

This commit is contained in:
cjw 2024-04-30 16:43:18 +08:00
parent 55f882ecb5
commit 2b7c28ad67
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/bo/SysScalePublishBo.java
View File

@ -33,7 +33,7 @@ public class SysScalePublishBo {
* 量表id，以逗号隔开 * 量表id，以逗号隔开
*/ */
@NotEmpty(message = "量表id，以逗号隔开不能为空", groups = {AddGroup.class, EditGroup.class}) @NotEmpty(message = "量表id，以逗号隔开不能为空", groups = {AddGroup.class, EditGroup.class})
@AutoMapping(target = "scaleIds", expression = "java(java.lang.String.join(\",\", source.getScaleIds()))") @AutoMapping(target = "scaleIds", expression = "java(cn.hutool.core.util.StrUtil.join(\",\", source.getScaleIds()))")
private List<String> scaleIds; private List<String> scaleIds;
private String scaleNames; private String scaleNames;
@ -43,11 +43,11 @@ public class SysScalePublishBo {
@NotBlank(message = "场次名称不能为空", groups = {AddGroup.class, EditGroup.class}) @NotBlank(message = "场次名称不能为空", groups = {AddGroup.class, EditGroup.class})
private String sessionName; private String sessionName;
@AutoMapping(target = "deptIds", expression = "java(java.lang.String.join(\",\", source.getDeptIds()))") @AutoMapping(target = "deptIds", expression = "java(cn.hutool.core.util.StrUtil.join(\",\", source.getDeptIds()))")
private List<String> deptIds; private List<String> deptIds;
private String deptNames; private String deptNames;
@AutoMapping(target = "userIds", expression = "java(java.lang.String.join(\",\", source.getUserIds()))") @AutoMapping(target = "userIds", expression = "java(cn.hutool.core.util.StrUtil.join(\",\", source.getUserIds()))")
private List<String> userIds; private List<String> userIds;
private String userNames; private String userNames;

8
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserPassWordExportVo.java
View File

@ -26,25 +26,25 @@ public class SysUserPassWordExportVo implements Serializable {
/** /**
* 分组名称 * 分组名称
*/ */
@ExcelProperty(value = "分组名称") @ExcelProperty(value = "班级")
private String deptName; private String deptName;
/** /**
* 用户昵称 * 用户昵称
*/ */
@ExcelProperty(value = "用户名称") @ExcelProperty(value = "用户姓名")
private String nickName; private String nickName;
/** /**
* 用户账号 * 用户账号
*/ */
@ExcelProperty(value = "登录名称") @ExcelProperty(value = "登录账号")
private String userName; private String userName;
/** /**
* 用户密码 * 用户密码
*/ */
@ExcelProperty(value = "用户密码") @ExcelProperty(value = "登录密码")
private String password; private String password;