Merge branch 'master' of https://e.coding.net/chuanghaikeji/smartCampus/backend_code

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

@@ -726,8 +726,13 @@ public class SmartAuthorGroupController implements SmartAuthorGroupControllerAPI
 
 //        获取年级
         SchoolClassVo schoolClassVo = smartClassService.getClassId(schoolClass);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("schoolClass",schoolClassVo.getClassId());
+        jsonObject.put("className",schoolClassVo.getClassName());
+        jsonObject.put("gradeId",schoolClassVo.getGradeId());
+        jsonObject.put("gradeName",schoolClassVo.getGradeName());
 
-        return CommonResult.ok(schoolClassVo);
+        return CommonResult.ok(jsonObject);
     }
 
 }

src/main/resources/mapper/template/SmartVisitorParentsConfigMapper.xml

@@ -25,7 +25,7 @@
             and svpc.class_id = #{classId}
         </if>
         <if test="gradeId != null and gradeId != '' and gradeId != 0 ">
-            and sc.gradeId=#{gradeId}
+            and sc.grade_id=#{gradeId}
         </if>
     </select>