albertshaw 8 years ago
parent
commit
5c922acf7e

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

@@ -296,13 +296,13 @@
     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 and provinceList != ''">
+    <if test="provinceList != null and provinceList.size > 0">
 	   and  al.province in
 	    <foreach collection="provinceList" item="plist"  open="(" separator="," close=")">
 			#{plist}
 		</foreach>
 	</if>
-	<if test="cityList != null and cityList !=''">
+	<if test="cityList != null and cityList.size > 0">
 		and al.city in 
 		<foreach collection="cityList" item="clist"  open="(" separator="," close=")">
 			#{clist}

+ 1 - 0
src/main/webapp/WEB-INF/views/common.html

@@ -397,6 +397,7 @@
 			window.showRoleList = /*[[${shiro.hasRole('999999') || shiro.isPermitted('api/admin/roleList')}]]*/false;
 			window.showAuditStatus = /*[[${shiro.hasRole('999999') || shiro.isPermitted('api/admin/auditStatus')}]]*/false;
 
+			window.showUserOrderList = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/userOrder')}]]*/false;
 			window.showSystem = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/system')}]]*/false;
 			/*]]>*/
 		</script>