Merge remote-tracking branch 'origin/master'

chuanyi_server/src/main/java/com/judong/chuanyiserver/controller/RoleController.java

@@ -193,4 +193,20 @@ public class RoleController {
         }
         return roleService.assignRoleAndMenu(role);
     }
+
+    /**
+     * 查看角色已有的菜单
+     *
+     */
+    @GetMapping("/queryRoleAndMenuId")
+    @PermissionControl
+    @WebLog(ServerEnum = ServerEnum.SERVER, ModelEnum = ModelEnum.ROLE, OperationEnum = OperationEnum.SELECT)
+    public Result queryRoleAndMenuId(Integer roleId){
+        if (Blank.isEmpty(roleId)){
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), ResultEnum.REQUEST_WRONGPARAMS.getRespMsg());
+        }
+        return roleService.queryRoleAndMenuId(roleId);
+    }
+
+
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/dao/UserDao.java

@@ -70,6 +70,8 @@ public interface UserDao {
      */
     Integer updatePassWord(@Param("user") User user);
 
+    Integer queryUserName(String name);
+
 
 
 

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/RoleService.java

@@ -38,4 +38,9 @@ public interface RoleService {
      * 为角色分配菜单
      */
     Result assignRoleAndMenu(Role role);
+
+    /**
+     * 查询角色已有菜单
+     */
+    Result queryRoleAndMenuId(Integer roleId);
 }

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/RoleServiceImpl.java

@@ -210,6 +210,11 @@ public class RoleServiceImpl implements RoleService {
         return Result.ok(jsonObject);
     }
 
+    @Override
+    public Result queryRoleAndMenuId(Integer roleId) {
+        return Result.ok(roleDao.queryRoleAndMenuId(roleId));
+    }
+
     public List<JSONObject> gennerMenuTree(List<Menu> menuList, Integer parentId) {
         List<JSONObject> jsonObjectList = new ArrayList<>();
         if (Blank.isEmpty(menuList)) {

chuanyi_server/src/main/java/com/judong/chuanyiserver/service/impl/UserServiceImpl.java

@@ -120,6 +120,11 @@ public class UserServiceImpl implements UserService {
      */
     @Override
     public Result backUserLogin(User user) {
+        //判断账号是否存在
+        Integer userName = userDao.queryUserName(user.getUserName());
+        if (userName<=0){
+            return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "用户名不存在");
+        }
         //获取登陆失败次数
         Integer count = (Integer) redisUtil.get("Number of password errors:" + user.getUserName());
         if (Blank.isEmpty(count)) {

chuanyi_server/src/main/resources/mapper/RoleDao.xml

@@ -46,13 +46,15 @@
                role_code
         FROM sys_role
         WHERE role_name = #{roleName}
+        and is_delete !=1
     </select>
 
     <select id="getRoleByNoIdName" resultType="com.judong.chuanyiserver.entity.Role">
         select id, role_name
         from sys_role
         where id != #{id}
-          and role_name = #{roleName}
+        and role_name = #{roleName}
+        and is_delete !=1
     </select>
 
     <select id="getRoleCount" resultType="java.lang.Long">

chuanyi_server/src/main/resources/mapper/UserDao.xml

@@ -225,6 +225,10 @@
         where user_id = #{user.userId}
     </update>
 
+    <select id="queryUserName" resultType="java.lang.Integer">
+        SELECT count(*) FROM sys_user WHERE BINARY user_name=#{name} and state!=2
+    </select>
+