Merge branch '105' into 'master'

105

See merge request !18

src/main/java/com/server/web/controller/ClassController.java

@@ -301,8 +301,9 @@ public class ClassController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "/selectSecondClassList", method = {RequestMethod.POST, RequestMethod.GET}, produces = "application/json")
-    public Map<String,Object> selectSecondClassList(@RequestParam(defaultValue = "-1")Integer type,@RequestParam(defaultValue = "")String name,@RequestParam(defaultValue = "1") Integer pageNo, @RequestParam(defaultValue = "1") Integer pageSize) {
+    public Map<String,Object> selectSecondClassList(long id,@RequestParam(defaultValue = "-1")Integer type,@RequestParam(defaultValue = "")String name,@RequestParam(defaultValue = "1") Integer pageNo, @RequestParam(defaultValue = "1") Integer pageSize) {
         Map paramMap = new HashMap<>();
+        paramMap.put("id",id);
         if(!("").equals(name)){
             paramMap.put("name","%"+name+"%");
         }

src/main/resources/mybatis/mapping/queryModel.xml

@@ -115,6 +115,7 @@
         t_base_second_class t
         WHERE
         t.`status` = 1
+        AND first_id =  #{id,jdbcType=BIGINT}
         <if test="type != null">
             AND t.type = #{type,jdbcType=INTEGER}
         </if>