Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/mapper/NazwSchoolDao.xml

@@ -97,7 +97,7 @@
                 AND nazw_school.location LIKE CONCAT('%', #{location}, '%')
             </if>
             <if test="department != null and department != ''">
-                AND nazw_school.competent_department = #{department}
+                AND nazw_school.competent_department LIKE CONCAT('%', #{department}, '%')
             </if>
             <if test="schoolType != null">
                 AND nazw_school.school_type = #{schoolType}
@@ -132,7 +132,7 @@
                 AND nazw_school.location LIKE CONCAT('%', #{location}, '%')
             </if>
             <if test="department != null and department != ''">
-                AND nazw_school.competent_department = #{department}
+                AND nazw_school.competent_department LIKE CONCAT('%', #{department}, '%')
             </if>
             <if test="schoolType != null">
                 AND nazw_school.school_type = #{schoolType}

nngkxxdp/src/main/resources/static/school/js/schoolDetail.js

@@ -44,7 +44,7 @@ function init(){
 }
 
 function back(){
-	window.location.replace(PATH + "/school/school.html")
+	window.location.replace("https://www.cqna.gov.cn//2022wzgb/sxna/xx/index.html")
 }
 
 function initHead(data){

nngkxxdp/src/main/resources/static/school/js/schoolDetailMobile.js

@@ -35,7 +35,7 @@ function init(){
 }
 
 function back(){
-	window.location.replace(PATH + "/school/school.html")
+	window.location.replace("https://www.cqna.gov.cn//2022wzgb/sxna/xx/index.html")
 }
 
 function initHead(data){

nngkxxdp/src/main/resources/static/school/school.html

@@ -134,10 +134,6 @@
 <script>
 
     if (isMobileUserAgent()){
-        console.log(11111111111111)
-        var searchUrl = window.parent.location.href;
-        var searchData = searchUrl.split("=");
-        let id = searchData[1]
         window.location = 'schoolMobile.html'
     }