|
|
|
|
@ -183,7 +183,6 @@ public class ExpertController extends JeecgController<Expert, IExpertService> { |
|
|
|
|
//用于查看本县区下面的专家信息无论是否审核，无论哪个部门
|
|
|
|
|
QueryWrapper<Expert> queryWrapper = QueryGenerator.initQueryWrapper(expert, req.getParameterMap()); |
|
|
|
|
queryWrapper.eq("isdone","Y"); |
|
|
|
|
queryWrapper.eq("compopen","2"); |
|
|
|
|
queryWrapper.in("seusername",usernames); |
|
|
|
|
Page<Expert> page = new Page<Expert>(pageNo, pageSize); |
|
|
|
|
IPage<Expert> pageList = expertService.page(page, queryWrapper); |
|
|
|
|
@ -457,41 +456,6 @@ public class ExpertController extends JeecgController<Expert, IExpertService> { |
|
|
|
|
return Result.OK("编辑成功!"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 编辑 |
|
|
|
|
* |
|
|
|
|
* @param expert |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
@AutoLog(value = "专家管理（市局管理员）-编辑") |
|
|
|
|
@ApiOperation(value="专家管理（市局管理员）-编辑", notes="专家管理（市局管理员）-编辑") |
|
|
|
|
@RequestMapping(value = "/editstatic", method = {RequestMethod.PUT,RequestMethod.POST}) |
|
|
|
|
public Result<String> editstatic(@RequestBody Expert expert) { |
|
|
|
|
if (expert.getExpsture().equals("N")) { |
|
|
|
|
expert.setErrinfo(""); |
|
|
|
|
} |
|
|
|
|
expertService.updateById(expert); |
|
|
|
|
//开始添加到用户表
|
|
|
|
|
SysUser user = new SysUser(); |
|
|
|
|
user.setAvatar(expert.getTopPic()); |
|
|
|
|
user.setSex(expert.getSex()); |
|
|
|
|
user.setRealname(expert.getRealname()); |
|
|
|
|
user.setUsername(expert.getSeusername()); |
|
|
|
|
user.setWorkNo(expert.getWorkon()); |
|
|
|
|
user.setEmail(expert.getEmails()); |
|
|
|
|
user.setPhone(expert.getPhone()); |
|
|
|
|
user.setCreateTime(new Date());//设置创建时间
|
|
|
|
|
String salt = oConvertUtils.randomGen(8); |
|
|
|
|
user.setSalt(salt); |
|
|
|
|
String passwordEncode = PasswordUtil.encrypt(expert.getSeusername(), expert.getPsd(), salt); |
|
|
|
|
user.setPassword(passwordEncode); |
|
|
|
|
user.setStatus(1); |
|
|
|
|
user.setDelFlag(CommonConstant.DEL_FLAG_0); |
|
|
|
|
sysUserService.editUser(user,"1843478958968647681", expert.getSsdep(), "", ""); |
|
|
|
|
return Result.OK("编辑成功!"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 编辑 |
|
|
|
|
* |
|
|
|
|
|
