Merge branch 'master' into mock

src/main/java/cn/qg/holmes/controller/auth/PermissionController.java

@@ -6,11 +6,11 @@ import cn.qg.holmes.service.auth.PermissionService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @CrossOrigin
@@ -61,9 +61,13 @@ public class PermissionController {
     }
 
     @GetMapping("/list/paging")
-    public JsonResult getPermissionListByPage(@RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+    public JsonResult getPermissionListByPage(@RequestParam Integer pageNum, @RequestParam Integer pageSize, String menuName) {
         IPage<Permission> iPage = new Page<>(pageNum, pageSize);
-        IPage page = permissionService.page(iPage);
+        QueryWrapper<Permission> permissionQueryWrapper = new QueryWrapper<>();
+        if (!StringUtils.isEmpty(menuName)) {
+            permissionQueryWrapper.eq("menu_name", menuName);
+        }
+        IPage page = permissionService.page(iPage, permissionQueryWrapper);
         Map<String, Object> map = new HashMap<>();
         map.put("total", page.getTotal());
         map.put("list", page.getRecords());

src/main/java/cn/qg/holmes/controller/auth/UserController.java

@@ -85,8 +85,9 @@ public class UserController {
      */
     @GetMapping("/list")
     public JsonResult getUserList(@RequestParam(defaultValue = "1") Integer pageNum,
-                                  @RequestParam(defaultValue = "10") Integer pageSize) {
-        IPage<UserRole> userIPage = userService.getUserInfoList(pageNum, pageSize);
+                                  @RequestParam(defaultValue = "10") Integer pageSize,
+                                  String userName, Integer roleId) {
+        IPage<UserRole> userIPage = userService.getUserInfoList(pageNum, pageSize, userName, roleId);
         Map<String, Object> map = new HashMap<>();
         map.put("total", userIPage.getTotal());
         map.put("list", userIPage.getRecords());

src/main/java/cn/qg/holmes/mapper/auth/UserMapper.java

@@ -9,5 +9,5 @@ import java.util.Map;
 
 public interface UserMapper extends BaseMapper<User> {
 
-    IPage<UserRole> getUserInfoList(IPage<User> page);
+    IPage<UserRole> getUserInfoList(IPage<User> page, String userName, Integer roleId);
 }

src/main/java/cn/qg/holmes/service/auth/UserService.java

@@ -12,5 +12,5 @@ public interface UserService extends IService<User> {
 
     UserInfoVo getUserInfoByUsername(String username);
 
-    IPage<UserRole> getUserInfoList(Integer pageNum, Integer pageSize);
+    IPage<UserRole> getUserInfoList(Integer pageNum, Integer pageSize, String userName, Integer roleId);
 }

src/main/java/cn/qg/holmes/service/auth/impl/UserServiceImpl.java

@@ -68,9 +68,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      * @return
      */
     @Override
-    public IPage<UserRole> getUserInfoList(Integer pageNum, Integer pageSize) {
+    public IPage<UserRole> getUserInfoList(Integer pageNum, Integer pageSize, String userName, Integer roleId) {
         IPage<User> page = new Page<>(pageNum, pageSize);
-        return userMapper.getUserInfoList(page);
+        return userMapper.getUserInfoList(page, userName, roleId);
     }
 
 }

src/main/resources/mapper/auth/UserMapper.xml

@@ -12,5 +12,12 @@
             INNER JOIN `role` r
             INNER JOIN `user_role` ur
             ON u.`id` = ur.`user_id` AND r.`id` = ur.`role_id`
+        WHERE 1 = 1
+        <if test="userName != null and userName !=''">
+            AND u.`username` = #{userName}
+        </if>
+        <if test="roleId != null and roleId !=''">
+            AND ur.`role_id` = #{roleId}
+        </if>
     </select>
 </mapper>
\ No newline at end of file