Browse Source

查询区域管理员

wanghui 8 years ago
parent
commit
2fb7ec4d03

+ 6 - 12
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -296,23 +296,17 @@
     left join admin_location al on al.admin_id = a.id
     left join admin aa on aa.id = a.superior_id
     where 1 = 1
-    <if test="provinceList != null">
+    <if test="provinceList != null and provinceList != ''">
 	   and  al.province in
 	    <foreach collection="provinceList" item="plist"  open="(" separator="," close=")">
 			#{plist}
 		</foreach>
 	</if>
-	<if test = "provinceList != null &amp;&amp; cityList != null">
-	or 
-	</if>
-	<if test="cityList != null">
-		<if test="provinceList == null">
-			and
-		</if>
-			al.city in 
-			<foreach collection="cityList" item="clist"  open="(" separator="," close=")">
-				#{clist}
-			</foreach>
+	<if test="cityList != null and cityList !=''">
+		and al.city in 
+		<foreach collection="cityList" item="clist"  open="(" separator="," close=")">
+			#{clist}
+		</foreach>
 	</if>
    </select>
    

+ 8 - 2
src/main/webapp/WEB-INF/views/portal/technologyTrading/achievement.html

@@ -154,9 +154,15 @@
 		 			</ol>
 				</div>
 			</div>
-			<div class="main_introduce">
+			<div class="achievementList">
+				<ol>
+					<li>行业</li>
+					<li>名称</li>
+					<li>类型</li>
+					<li>交易方式</li>
+					<li>成熟度</li>			
+				</ol>
 				<ul>
-								
 				</ul>
 			</div>
 			<div class="container pagination_box">