bug fixes

src/main/java/com/caimei/modules/shiro/controller/ShiroController.java

@@ -29,7 +29,7 @@ public class ShiroController {
     public JsonModel login(@RequestBody CmMallAdminUser adminUser) {
         JsonModel jsonModel = JsonModel.newInstance();
         //用户信息
-        CmMallAdminUser user = shiroService.findByUsername(adminUser.getAccount(), adminUser.getOrganizeID());
+        CmMallAdminUser user = shiroService.findByUsername(adminUser.getAccount());
         //账号不存在、密码错误
         if (user == null || !user.getPassword().equals(MD5Util.md5(adminUser.getPassword() + user.getSalt()))) {
             return jsonModel.error("账号或密码有误");

src/main/java/com/caimei/modules/shiro/dao/UserDao.java

@@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface UserDao {
-    CmMallAdminUser findByUsername(@Param("account") String account, @Param("organizeID") Integer organizeID);
+    CmMallAdminUser findByUsername(@Param("account") String account);
 
     CmMallAdminUser findByUserId(Integer id);
 

src/main/java/com/caimei/modules/shiro/service/ShiroService.java

@@ -6,7 +6,7 @@ import com.caimei.modules.shiro.entity.CmMallOrganize;
 
 public interface ShiroService {
 
-    CmMallAdminUser findByUsername(String account, Integer organizeID);
+    CmMallAdminUser findByUsername(String account);
 
     String createToken(CmMallAdminUser user) throws Exception;
 

src/main/java/com/caimei/modules/shiro/service/impl/ShiroServiceImpl.java

@@ -28,8 +28,8 @@ public class ShiroServiceImpl implements ShiroService {
      * @return User
      */
     @Override
-    public CmMallAdminUser findByUsername(String account, Integer organizeID) {
-        CmMallAdminUser user = userDao.findByUsername(account, organizeID);
+    public CmMallAdminUser findByUsername(String account) {
+        CmMallAdminUser user = userDao.findByUsername(account);
         return user;
     }
 

src/main/resources/mapper/UserMapper.xml

@@ -10,7 +10,6 @@
           cm_mall_admin_user
         WHERE
           account = #{account}
-          AND organizeID = #{organizeID}
           AND delFlag = '0'
     </select>