|
|
|
@ -25,16 +25,16 @@ public class LoginService {
|
|
|
|
|
public AjaxResult login(String name, String pass) {
|
|
|
|
|
try {
|
|
|
|
|
String salt = mapper.login_findSalt(name);
|
|
|
|
|
SysUser userID = mapper.login_getUser(name, getMD5Str(name + pass + salt));
|
|
|
|
|
if (userID != null) {
|
|
|
|
|
SysUser user = mapper.login_getUser(name, getMD5Str(name + pass + salt));
|
|
|
|
|
if (user != null) {
|
|
|
|
|
// List<String> menuNameList=name.equals("admin")?
|
|
|
|
|
// mapper.selectMenuName():
|
|
|
|
|
// mapper.selectMenuNameByUserID(userID);
|
|
|
|
|
// mapper.selectMenuNameByUserID(user);
|
|
|
|
|
// if (menuNameList==null||menuNameList.isEmpty()){
|
|
|
|
|
// return "isEmpty";
|
|
|
|
|
// }
|
|
|
|
|
// return JSONObject.toJSONString(menuNameList);
|
|
|
|
|
return AjaxResult.success(userID);
|
|
|
|
|
return AjaxResult.success(user);
|
|
|
|
|
} else {
|
|
|
|
|
return AjaxResult.error();
|
|
|
|
|
}
|
|
|
|
|