Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/AdminUserServiceImpl.java

@@ -1,15 +1,10 @@
package com.yeshi.fanli.service.impl;



import java.io.Serializable;

import java.util.List;



import javax.annotation.Resource;



import org.springframework.stereotype.Service;



import com.yeshi.fanli.dao.AdminUserDao;

import com.yeshi.fanli.dao.mybatis.AdminUserMapper;

import com.yeshi.fanli.entity.bus.user.ExtractAuditRecord;

import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.service.AdminUserService;



@@ -17,21 +12,14 @@
public class AdminUserServiceImpl implements AdminUserService {



   @Resource

   private AdminUserDao adminUserDao;

   @Resource

   private AdminUserMapper adminUserMapper;

   

   

   public AdminUser login(final String acction, final String pwd) {

			
      List<AdminUser> list = adminUserDao.list("from AdminUser a where a.account=? and a.pwd=? ",new Serializable[]{acction,pwd});	
			
      if(list.size() > 0){

         return list.get(0);

      }

      return null;

   public AdminUser login(String acction, String pwd) {

      return adminUserMapper.getByAccountAndPwd(acction, pwd);

   }

   

	
   @Override

   public AdminUser selectByPrimaryKey(Long id){

      return adminUserMapper.selectByPrimaryKey(id);