|
|
@ -193,7 +193,6 @@ public class ExpertController extends JeecgController<Expert, IExpertService> { |
|
|
|
String depid = expertService.getdeps(sysUser.getId()); |
|
|
|
String depid = expertService.getdeps(sysUser.getId()); |
|
|
|
SysDepart sysDepart = sysDepartService.getById(depid); |
|
|
|
SysDepart sysDepart = sysDepartService.getById(depid); |
|
|
|
experttemp.setRealname(sysUser.getRealname()); |
|
|
|
experttemp.setRealname(sysUser.getRealname()); |
|
|
|
experttemp.setSepsd(sysUser.getPassword()); |
|
|
|
|
|
|
|
experttemp.setWorkon(sysUser.getWorkNo()); |
|
|
|
experttemp.setWorkon(sysUser.getWorkNo()); |
|
|
|
experttemp.setSex(sysUser.getSex()); |
|
|
|
experttemp.setSex(sysUser.getSex()); |
|
|
|
experttemp.setTopPic(sysUser.getAvatar()); |
|
|
|
experttemp.setTopPic(sysUser.getAvatar()); |
|
|
@ -395,7 +394,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> { |
|
|
|
expert.setCompopen("2"); |
|
|
|
expert.setCompopen("2"); |
|
|
|
|
|
|
|
|
|
|
|
//开始添加到用户表
|
|
|
|
//开始添加到用户表
|
|
|
|
/* SysUser user = new SysUser(); |
|
|
|
SysUser user = new SysUser(); |
|
|
|
user.setAvatar(expert.getTopPic()); |
|
|
|
user.setAvatar(expert.getTopPic()); |
|
|
|
user.setSex(expert.getSex()); |
|
|
|
user.setSex(expert.getSex()); |
|
|
|
user.setRealname(expert.getRealname()); |
|
|
|
user.setRealname(expert.getRealname()); |
|
|
@ -410,8 +409,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> { |
|
|
|
user.setPassword(passwordEncode); |
|
|
|
user.setPassword(passwordEncode); |
|
|
|
user.setStatus(1); |
|
|
|
user.setStatus(1); |
|
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0); |
|
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0); |
|
|
|
sysUserService.saveUser(user, "1843478958968647681", expert.getSsdep(), "");*/ |
|
|
|
sysUserService.saveUser(user, "1843478958968647681", expert.getSsdep(), ""); |
|
|
|
expertService.updateuser(expert.getTopPic(),expert.getSex(),expert.getSeusername()); |
|
|
|
|
|
|
|
expertService.save(expert); |
|
|
|
expertService.save(expert); |
|
|
|
//
|
|
|
|
//
|
|
|
|
return Result.OK("添加成功!"); |
|
|
|
return Result.OK("添加成功!"); |
|
|
@ -440,7 +438,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> { |
|
|
|
public Result<String> edit(@RequestBody Expert expert) { |
|
|
|
public Result<String> edit(@RequestBody Expert expert) { |
|
|
|
expertService.updateById(expert); |
|
|
|
expertService.updateById(expert); |
|
|
|
//开始添加到用户表
|
|
|
|
//开始添加到用户表
|
|
|
|
/*SysUser user = new SysUser(); |
|
|
|
SysUser user = new SysUser(); |
|
|
|
user.setAvatar(expert.getTopPic()); |
|
|
|
user.setAvatar(expert.getTopPic()); |
|
|
|
user.setSex(expert.getSex()); |
|
|
|
user.setSex(expert.getSex()); |
|
|
|
user.setRealname(expert.getRealname()); |
|
|
|
user.setRealname(expert.getRealname()); |
|
|
@ -455,8 +453,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> { |
|
|
|
user.setPassword(passwordEncode); |
|
|
|
user.setPassword(passwordEncode); |
|
|
|
user.setStatus(1); |
|
|
|
user.setStatus(1); |
|
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0); |
|
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0); |
|
|
|
sysUserService.editUser(user,"1843478958968647681", expert.getSsdep(), "", "");*/ |
|
|
|
sysUserService.editUser(user,"1843478958968647681", expert.getSsdep(), "", ""); |
|
|
|
expertService.updateuser(expert.getTopPic(),expert.getSex(),expert.getSeusername()); |
|
|
|
|
|
|
|
return Result.OK("编辑成功!"); |
|
|
|
return Result.OK("编辑成功!"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -510,7 +507,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> { |
|
|
|
expert.setCompopen("1"); |
|
|
|
expert.setCompopen("1"); |
|
|
|
expertService.updateById(expert); |
|
|
|
expertService.updateById(expert); |
|
|
|
//开始添加到用户表
|
|
|
|
//开始添加到用户表
|
|
|
|
/* SysUser user = new SysUser(); |
|
|
|
SysUser user = new SysUser(); |
|
|
|
user.setAvatar(expert.getTopPic()); |
|
|
|
user.setAvatar(expert.getTopPic()); |
|
|
|
user.setSex(expert.getSex()); |
|
|
|
user.setSex(expert.getSex()); |
|
|
|
user.setRealname(expert.getRealname()); |
|
|
|
user.setRealname(expert.getRealname()); |
|
|
@ -525,8 +522,7 @@ public class ExpertController extends JeecgController<Expert, IExpertService> { |
|
|
|
user.setPassword(passwordEncode); |
|
|
|
user.setPassword(passwordEncode); |
|
|
|
user.setStatus(1); |
|
|
|
user.setStatus(1); |
|
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0); |
|
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0); |
|
|
|
sysUserService.editUser(user,"1843478958968647681", expert.getSsdep(), "", "");*/ |
|
|
|
sysUserService.editUser(user,"1843478958968647681", expert.getSsdep(), "", ""); |
|
|
|
expertService.updateuser(expert.getTopPic(),expert.getSex(),expert.getSeusername()); |
|
|
|
|
|
|
|
return Result.OK("编辑成功!"); |
|
|
|
return Result.OK("编辑成功!"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|