|
@@ -51,7 +51,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
@Resource
|
|
|
private DepartmentMapper departmentMapper;
|
|
|
|
|
|
- //登录网页端 管理员或负责人可以登录
|
|
|
+ //登录网页端
|
|
|
@Override
|
|
|
public HttpRespMsg loginAdmin(String username, String password) {
|
|
|
HttpRespMsg httpRespMsg = new HttpRespMsg();
|
|
@@ -63,10 +63,10 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
} else if (userList.size() > 1) {
|
|
|
//检索到两个及以上账号时
|
|
|
httpRespMsg.setError("账号重名");
|
|
|
- } else if (userList.get(0).getRole() == 0) {
|
|
|
+ } /*else if (userList.get(0).getRole() == 0) {
|
|
|
//检索的账号role是0 即是普通员工时
|
|
|
httpRespMsg.setError("无登录权限");
|
|
|
- } else if (MD5Util.getPassword(password).equals(userList.get(0).getPassword())) {
|
|
|
+ }*/ else if (MD5Util.getPassword(password).equals(userList.get(0).getPassword())) {
|
|
|
//查看该公司非会员公司,只能允许试用三天,超时不可登录
|
|
|
Company company = companyMapper.selectOne(new QueryWrapper<Company>().eq("id", userList.get(0).getCompanyId()));
|
|
|
//公司未办理会员
|
|
@@ -99,7 +99,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
return httpRespMsg;
|
|
|
}
|
|
|
|
|
|
- //登录网页端 所有人都可以登录
|
|
|
+ //登录网页端
|
|
|
@Override
|
|
|
public HttpRespMsg loginEmployee(String username, String password) {
|
|
|
HttpRespMsg httpRespMsg = new HttpRespMsg();
|