床位接口优化

src/main/java/com/template/controller/LoginController.java

@@ -302,7 +302,7 @@ public class LoginController implements LoginControllerAPI {
         TokenDateVo token = JWTUtil.getToken(id_card, student.getId(), expired);
         wlv.setToken(token.getToken());
         System.out.println("微校授权成功：" + user_name + "" + card_number);
-        response.sendRedirect(wxOpenidConfig.getIp() + "/#/pages/index/index/?urlstr=" + urlstr + "&token=" + token + "&type" + idenType);
+        response.sendRedirect(wxOpenidConfig.getIp() + "/#/pages/index/index/?urlstr=" + urlstr + "&token=" + token + "&type=" + idenType);
         return CommonResult.ok(wlv);
     }
 

src/main/java/com/template/services/impl/WelcomeBedServiceImpl.java

@@ -12,6 +12,7 @@ import com.template.services.WelcomeBedService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
@@ -45,14 +46,14 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     public PageUtils<WelcomeBed> queryPageWelcomeBeds(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
         Page<WelcomeBed> page = new Page<>(currentPage, pageCount);
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("school_id",schoolId);
-        queryWrapper.eq("build_id",buildId);
-        queryWrapper.eq("dormitory_id",dormitoryId);
-        queryWrapper.eq("sex",sex);
-        queryWrapper.eq("is_check",isCheck);
-        queryWrapper.eq("college_id",collegeId);
-        queryWrapper.eq("major_id",majorId);
-        queryWrapper.eq("classstr_id",classstrId);
+        queryWrapper.eq(schoolId != null ,"school_id",schoolId);
+        queryWrapper.eq(buildId != null,"build_id",buildId);
+        queryWrapper.eq(dormitoryId != null,"dormitory_id",dormitoryId);
+        queryWrapper.eq(StringUtils.hasText(sex),"sex",sex);
+        queryWrapper.eq(isCheck != null,"is_check",isCheck);
+        queryWrapper.eq(collegeId != null,"college_id",collegeId);
+        queryWrapper.eq(majorId != null,"major_id",majorId);
+        queryWrapper.eq(classstrId != null,"classstr_id",classstrId);
         queryWrapper.orderByDesc("update_time");
         IPage<WelcomeBed> result = welcomeBedMapper.selectPage(page,queryWrapper);
         return new PageUtils<>(result);
@@ -84,14 +85,14 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     @Override
     public List<WelcomeBed> queryPageWelcomeBeds(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("school_id",schoolId);
-        queryWrapper.eq("build_id",buildId);
-        queryWrapper.eq("dormitory_id",dormitoryId);
-        queryWrapper.eq("sex",sex);
-        queryWrapper.eq("is_check",isCheck);
-        queryWrapper.eq("college_id",collegeId);
-        queryWrapper.eq("major_id",majorId);
-        queryWrapper.eq("classstr_id",classstrId);
+        queryWrapper.eq(schoolId != null ,"school_id",schoolId);
+        queryWrapper.eq(buildId != null,"build_id",buildId);
+        queryWrapper.eq(dormitoryId != null,"dormitory_id",dormitoryId);
+        queryWrapper.eq(StringUtils.hasText(sex),"sex",sex);
+        queryWrapper.eq(isCheck != null,"is_check",isCheck);
+        queryWrapper.eq(collegeId != null,"college_id",collegeId);
+        queryWrapper.eq(majorId != null,"major_id",majorId);
+        queryWrapper.eq(classstrId != null,"classstr_id",classstrId);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }