Commit 6014962b by 284718418@qq.com

合并华颐 审批流程 代码

parent 62693996
......@@ -152,7 +152,7 @@ public class LoginController {
@Value("${config-8timer.authentication-code}")
public String authentication_code;
//2020/0517 redis缓存taoxy
//2020/0517 redis缓存taoxy
@Autowired
private HttpSession session;
......@@ -1059,16 +1059,16 @@ public class LoginController {
}else {
return ResultUtil.error("登录失败");
}
}else {
return ResultUtil.error("登录有误");
}
}else {
return ResultUtil.error("验证失败");
}
}else {
}else {
return ResultUtil.error("登录有误");
}
}else {
return ResultUtil.error("验证失败");
}
}else {
// return ResultUtil.error("二维码已过期");
return ResultUtil.success("4");
}
return ResultUtil.success("4");
}
}
......@@ -1138,14 +1138,14 @@ public class LoginController {
//
QyzxEmpLogin.builder().orgId(orgcodeid).build().update(new QueryWrapper<QyzxEmpLogin>().lambda().eq(QyzxEmpLogin::getPhone, userBean.getQyzxEmpLogin().getPhone()));
QyzxEmpLogin qyzxEmpLogin1 = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
.eq(QyzxEmpLogin::getPhone, userBean.getQyzxEmpLogin().getPhone()).one();
if (qyzxEmpLogin1 != null) {
QyzxEmpLogin qyzxEmpLogin1 = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
.eq(QyzxEmpLogin::getPhone, userBean.getQyzxEmpLogin().getPhone()).one();
if (qyzxEmpLogin1 != null) {
return loginhan(qyzxEmpLogin1, request);
}else {
return ResultUtil.error("切换失败!!");
}
return loginhan(qyzxEmpLogin1, request);
}else {
return ResultUtil.error("切换失败!!");
}
}
......@@ -1153,14 +1153,14 @@ public class LoginController {
@ApiOperation(value = "刷新纪录", httpMethod = "GET", notes = "是否有账号")
public Result<QyzxEmpLogin> RecordBreaking(@CurrentUser UserBean userBean,HttpServletRequest request) {
QyzxEmpLogin qyzxEmpLogin1 = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
.eq(QyzxEmpLogin::getPhone, userBean.getQyzxEmpLogin().getPhone()).eq(QyzxEmpLogin::getOrgId, userBean.getOrgCode()).one();
if (qyzxEmpLogin1 != null) {
QyzxEmpLogin qyzxEmpLogin1 = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
.eq(QyzxEmpLogin::getPhone, userBean.getQyzxEmpLogin().getPhone()).eq(QyzxEmpLogin::getOrgId, userBean.getOrgCode()).one();
if (qyzxEmpLogin1 != null) {
return loginhan(qyzxEmpLogin1, request);
}else {
return ResultUtil.error("刷新失败!!");
}
return loginhan(qyzxEmpLogin1, request);
}else {
return ResultUtil.error("刷新失败!!");
}
}
......
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