xuq

src/main/java/com/gree/mall/manager/controller/admin/AdminUserController.java

@@ -91,11 +91,12 @@ public class AdminUserController {
             @ApiParam(value = "角色id", required = false) @RequestParam(required = false) String roleId,
             @ApiParam(value = "状态 true:正常 false:冻结", required = false) @RequestParam(required = false) Boolean status,
             @ApiParam(value = "用户名", required = false) @RequestParam(required = false) String userName,
+            @ApiParam(value = "商户名称", required = false) @RequestParam(required = false) String companyName,
             @ApiParam(value = "页号", required = true) @RequestParam(required = true) Integer pageNum,
             @ApiParam(value = "页大小", required = true) @RequestParam(required = true) Integer pageSize,
             HttpServletRequest request
     ) throws RemoteServiceException {
-        IPage<AdminUser> page = adminUserLogic.list(roleId, status, userName, pageNum, pageSize, request);
+        IPage<AdminUser> page = adminUserLogic.list(companyName,roleId, status, userName, pageNum, pageSize, request);
         return ResponseHelper.success(page);
     }
 

src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -326,7 +326,7 @@ public class AdminUserLogic {
      *
      * @return
      */
-    public IPage<AdminUser> list(String roleId, Boolean status, String userName, Integer pageNum, Integer pageSize, HttpServletRequest request) {
+    public IPage<AdminUser> list(String companyName,String roleId, Boolean status, String userName, Integer pageNum, Integer pageSize, HttpServletRequest request) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
 
         Set<String> adminUserIdList = new HashSet<>();
@@ -437,7 +437,7 @@ public class AdminUserLogic {
     /**
      * 商户列表
      */
-    public IPage<AdminUser> list(String userName, String nickName, String linkPhone, String email, Boolean status, Integer pageNum, Integer pageSize) {
+    public IPage<AdminUser> list(String companyName,String userName, String nickName, String linkPhone, String email, Boolean status, Integer pageNum, Integer pageSize) {
         IPage<AdminUser> adminUserIPage = adminMapper.mchList(new Page(pageNum, pageSize), userName, nickName, linkPhone, email, status);
         return adminUserIPage;
     }

src/main/resources/mapper/AdminMapper.xml

@@ -10,8 +10,9 @@
             <if test="userName != null and userName !=''">
                 a.user_name like concat('%',#{userName},'%')
             </if>
-            <if test="nickName != null and nickName !=''">
-                a.nick_name like concat('%',#{nickName},'%')
+
+            <if test="companyName != null and companyName !=''">
+                a.company_name like concat('%',#{companyName},'%')
             </if>
             <if test="linkPhone != null and linkPhone !=''">
                 a.link_phone like concat('%',#{linkPhone},'%')