Merge branch 'gaixiankang' into 'dev'

分页、按章节排序

See merge request !98

quality-review/src/main/java/com/ruoyi/web/ReviewStandardController.java

@@ -38,10 +38,11 @@ public class ReviewStandardController extends BaseController {
      * 分页查询标准(检验内容库)
      * @return
      */
+    @Anonymous
     @ApiOperation("分页查询标准(检验内容库)")
     @PostMapping("/list")
     public TableDataInfo<ReviewStandardResponse> listByPage(@Validated @RequestBody ReviewStandardListByPageRequest request) {
-        startPage();
+        startPage(request);
         List<ReviewStandardResponse> list = reviewStandardService.listByPage(request);
         return getDataTable(list);
     }

quality-review/src/main/resources/mapper/ReviewStandardMapper.xml

@@ -44,6 +44,8 @@
             <if test="chapter != null and chapter != ''"> and chapter like concat('%', #{chapter}, '%') </if>
             <if test="text != null and text != ''"> and text like concat('%', #{text}, '%') </if>
         </where>
+        ORDER BY
+            chapter
     </select>
 
 

ruoyi-admin/src/test/java/com/ruoyi/InspectionContentTest.java

@@ -31,7 +31,7 @@ public class InspectionContentTest {
     @Test
     public void standardAdd() {
         ReviewStandard build = ReviewStandard.builder()
-                .chapter("7.1.1.1")
+                .chapter("7.1.1.2")
                 .text("车端具备远程控制功能的系统、授权的第三方应用等外部连接系统不应存在由汽车行业权威漏洞平台6个月前公布且未经处置的高危及以上的安全漏洞。\n" +
                         "\n" +
                         "注1：汽车行业权威漏洞平台如车联网产品专用漏洞库NVDB-CAVD等政府主管部门认可的其他漏洞平台。\n" +