no message

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

@@ -27,13 +27,13 @@ public class AdminRoleController {
     @ApiOperation(value = "角色列表")
     public ResponseHelper<IPage<AdminRole>> list(
             HttpServletRequest request,
-            @ApiParam(value = "商户名称") @RequestParam(required = false) String companyWechatName,
+            @ApiParam(value = "商户名称") @RequestParam(required = false) String companyName,
             @ApiParam(value = "上级商户") @RequestParam(required = false) String adminCompanyId,
             @ApiParam(value = "适用机构 2:商家 1:商户 0:平台") @RequestParam(required = false) Integer type,
             @ApiParam(value = "页号", required = true) @RequestParam Integer pageNum,
             @ApiParam(value = "页大小", required = true) @RequestParam Integer pageSize
     ) throws RemoteServiceException {
-        IPage<AdminRole> adminRoleIPage = adminRoleLogic.listPage(request, companyWechatName, adminCompanyId, type, pageNum, pageSize);
+        IPage<AdminRole> adminRoleIPage = adminRoleLogic.listPage(request, companyName, adminCompanyId, type, pageNum, pageSize);
         return ResponseHelper.success(adminRoleIPage);
     }
 

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

@@ -36,14 +36,14 @@ public class AdminRoleLogic {
     /**
      * 角色列表
      */
-    public IPage<AdminRole> listPage(HttpServletRequest request, String companyWechatName, String adminCompanyId, Integer type, Integer pageNo, Integer pageSize) {
+    public IPage<AdminRole> listPage(HttpServletRequest request, String companyName, String adminCompanyId, Integer type, Integer pageNo, Integer pageSize) {
         AdminUserCom adminUser = commonLogic.getAdminUser(request);
         List<String> companyIds = adminUser.getAdminCompanyIds();
 
         Integer userType = this.checkUserType(adminUser);
 
         return adminRoleService.lambdaQuery()
-                .eq(StringUtils.isNotBlank(companyWechatName), AdminRole::getCompanyName, companyWechatName)
+                .eq(StringUtils.isNotBlank(companyName), AdminRole::getCompanyName, companyName)
                 .eq(StringUtils.isNotBlank(adminCompanyId), AdminRole::getCompanyId, adminCompanyId)
                 .eq(Objects.nonNull(type), AdminRole::getType, type)
                 .ge(userType > 0, AdminRole::getType, userType)