Merge remote-tracking branch 'origin/master'

common/src/main/java/com/winsun/bean/School.java

 package com.winsun.bean;
 package com.winsun.bean;
 
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.enums.IdType;
@@ -39,6 +40,7 @@ public class School implements Serializable {
     /**
     /**
      * 二维码扫码后默认办理套餐
      * 二维码扫码后默认办理套餐
      */
      */
+    @TableField(value = "defaultPackage")
     private int defaultPackage;
     private int defaultPackage;
 
 
     /**
     /**
@@ -72,11 +74,6 @@ public class School implements Serializable {
     private String url;
     private String url;
 
 
     /**
     /**
-     * 0小白卡 1普通卡
-     */
-    private int isXb;
-
-    /**
      * 是否新装融合(0:否 1:是)
      * 是否新装融合(0:否 1:是)
      */
      */
     private int netType;
     private int netType;

service-manager/src/main/java/com/winsun/controller/SchoolManagementController.java

@@ -95,10 +95,19 @@ public class SchoolManagementController extends BaseController {
         return ResponseData.success("修改完毕！");
         return ResponseData.success("修改完毕！");
     }
     }
 
 
-    @Permission(menuname = "查询學校信息", value = "findByList", method = RequestMethod.POST)
+    /**
+     *
+     * @param subName
+     * @param status
+     * @param schoolName
+     * @param netType
+     * @param pageIndex
+     * @param pageSize
+     * @return
+     */
+    @Permission(menuname = "查询学校信息", value = "findByList", method = RequestMethod.POST)
     public ResponseData<Page<School>> listSchool(@RequestParam("subName") String subName, @RequestParam("status") String status,
     public ResponseData<Page<School>> listSchool(@RequestParam("subName") String subName, @RequestParam("status") String status,
-                                                 @RequestParam("schoolName") String schoolName, @RequestParam("isXb") String isXb,
-                                                 @RequestParam("netType") String netType, @RequestParam(name = "pageIndex", required = false) int pageIndex,
+                                                 @RequestParam("schoolName") String schoolName, @RequestParam("netType") String netType, @RequestParam(name = "pageNo", required = false) int pageIndex,
                                                  @RequestParam(name = "pageSize", required = false) int pageSize) {
                                                  @RequestParam(name = "pageSize", required = false) int pageSize) {
         ShiroUser user = getShiroUser();
         ShiroUser user = getShiroUser();
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员"))) {
@@ -107,9 +116,8 @@ public class SchoolManagementController extends BaseController {
         Wrapper<School> wrapper = new EntityWrapper();
         Wrapper<School> wrapper = new EntityWrapper();
         wrapper.like(StringUtils.isNotBlank(schoolName), "school_name", schoolName, SqlLike.DEFAULT);
         wrapper.like(StringUtils.isNotBlank(schoolName), "school_name", schoolName, SqlLike.DEFAULT);
         wrapper.eq(StringUtils.isNotBlank(subName), "sub_name", subName);
         wrapper.eq(StringUtils.isNotBlank(subName), "sub_name", subName);
-        wrapper.eq(StringUtils.isNotBlank(status), "status", Integer.parseInt(status));
-        wrapper.eq(StringUtils.isNotBlank(isXb), "is_xb", Integer.parseInt(isXb));
-        wrapper.eq(StringUtils.isNotBlank(netType), "net_type", Integer.parseInt(netType));
+        wrapper.eq(StringUtils.isNotBlank(status), "status", status);
+        wrapper.eq(StringUtils.isNotBlank(netType), "net_type", netType);
         Page<School> page = new Page<>(pageIndex, pageSize);
         Page<School> page = new Page<>(pageIndex, pageSize);
         List<School> schools = schoolMapper.selectPage(page, wrapper);
         List<School> schools = schoolMapper.selectPage(page, wrapper);
         page.setRecords(schools);
         page.setRecords(schools);