Commit b441c681 authored by mx's avatar mx

bug

parent dc6a7961
...@@ -24,6 +24,9 @@ import java.util.List; ...@@ -24,6 +24,9 @@ import java.util.List;
@TableName("sys_user") @TableName("sys_user")
public class SysUser extends CyIdIncreEntity<SysUser> { public class SysUser extends CyIdIncreEntity<SysUser> {
//权重
@Transient
private Integer dictSort;
//角色 //角色
@Transient @Transient
private List roleList; private List roleList;
......
...@@ -237,7 +237,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser> ...@@ -237,7 +237,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
if (sysDictData.size() != 0) { if (sysDictData.size() != 0) {
//查询职位中文名 //查询职位中文名
String dictLabel = sysDictData.get(0).getDictLabel(); String dictLabel = sysDictData.get(0).getDictLabel();
//查询权重
Integer dictSort = sysDictData.get(0).getDictSort();
sysUserIPage.getRecords().get(i).setDictLabelByPosition(dictLabel); sysUserIPage.getRecords().get(i).setDictLabelByPosition(dictLabel);
sysUserIPage.getRecords().get(i).setDictSort(dictSort);
} }
//查询班次id //查询班次id
...@@ -250,6 +253,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser> ...@@ -250,6 +253,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
} }
} }
return sysUserIPage; return sysUserIPage;
} }
...@@ -446,6 +450,22 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser> ...@@ -446,6 +450,22 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserRepositorys, SysUser>
for (ExportUserDTO sysUser : sysUserList) { for (ExportUserDTO sysUser : sysUserList) {
sysUser.setIdentity("0"); sysUser.setIdentity("0");
//数据库需要插入的用户信息 //数据库需要插入的用户信息
//登录名
if (sysUser.getUsername() == null) {
throw new CyServiceException(500, "数据错误");
}
//手机号
if (sysUser.getPhone() == null) {
throw new CyServiceException(500, "数据错误");
}
//人脸信息
if (sysUser.getFaceAddress() == null) {
throw new CyServiceException(500, "数据错误");
}
//所属园区
if (sysUser.getAddress() == null) {
throw new CyServiceException(500, "数据错误");
}
//性别 //性别
if (sysUser.getSex() != null) { if (sysUser.getSex() != null) {
if (sysUser.getSex().equals("男")) { if (sysUser.getSex().equals("男")) {
......
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