Antiloveg пре 8 година
родитељ
комит
43b81c7719

+ 5 - 0
src/main/java/com/goafanti/common/controller/BaseController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.ModelAttribute;
 
 import com.goafanti.common.bo.Error;
+import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
 
@@ -93,5 +94,9 @@ public class BaseController {
 		if (SecurityUtils.getSubject().getPrincipal()  instanceof User){
 			model.addAttribute("userData", TokenManager.getToken() );
 		}
+		
+		if (SecurityUtils.getSubject().getPrincipal()  instanceof Admin){
+			model.addAttribute("adminData", TokenManager.getAdminToken() );
+		}
 	}
 }

+ 9 - 4
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -198,8 +198,9 @@
   <select id="findUserListByPage" parameterType="String" resultType="com.goafanti.user.bo.UserListBo">
   	select u.id ,u.mobile, u.email, u.create_time as createTime, 
   	       u.number , i.aft_username as aftUsername, i.audit_status as auditStatus, a.name as adminName
-    from user u  LEFT JOIN admin a on a.id = u.aid
-   LEFT JOIN user_identity i 
+    from user u  
+    LEFT JOIN admin a on a.id = u.aid
+    LEFT JOIN user_identity i 
     ON u.id = i.uid  where u.type = 0
     <if test = "mobile != null">
 	    and u.mobile = #{mobile,jdbcType=VARCHAR}
@@ -222,6 +223,7 @@
 	<if test="auditStatus != null">
 		and i.audit_status= #{auditStatus,jdbcType=INTEGER}
 	</if>
+	order by u.create_time desc
 	<if test="page_sql!=null">
 		${page_sql}
 	</if>
@@ -257,8 +259,10 @@
   
   <select id="findOrgListByPage" parameterType="String" resultType="com.goafanti.user.bo.OrgListBo">
   select u.id ,u.mobile, u.email, u.create_time as createTime, 
-  	       u.number , o.aft_username as aftUsername, o.audit_status as auditStatus, a.name as adminName
-    from user u  LEFT JOIN admin a on a.id = u.aid 
+  	       u.number , o.aft_username as aftUsername, o.audit_status as auditStatus, a.name as adminName,
+  	       o.unit_name as unitName
+    from user u  
+    LEFT JOIN admin a on a.id = u.aid 
 	LEFT JOIN organization_identity o 
     ON u.id = o.uid 
     WHERE u.type = 1
@@ -284,6 +288,7 @@
 	<if test="auditStatus != null">
 		and o.audit_status= #{auditStatus,jdbcType=INTEGER}
 	</if>
+	order by u.create_time desc
 	<if test="page_sql!=null">
 		${page_sql}
 	</if>

+ 12 - 0
src/main/java/com/goafanti/user/bo/OrgListBo.java

@@ -20,6 +20,8 @@ public class OrgListBo {
     private Integer auditStatus;
     
     private String adminName;
+    
+    private String unitName;
 
 	public String getId() {
 		return id;
@@ -84,6 +86,16 @@ public class OrgListBo {
 	public void setAdminName(String adminName) {
 		this.adminName = adminName;
 	}
+	
+	
+
+	public String getUnitName() {
+		return unitName;
+	}
+
+	public void setUnitName(String unitName) {
+		this.unitName = unitName;
+	}
 
 	//注册时间
 	public String getCreateTimeFormattedDate(){

+ 20 - 4
src/main/webapp/WEB-INF/views/header.jsp

@@ -24,11 +24,12 @@
 	  		   lvl : "${userData.lvl}"
   		   }
   	   </c:if>
-  	   
+  		   
   	   <c:if test="${empty userData}">
-  	    window.userData = ""
-  	   </c:if>
-  	 
+   	    window.userData = ""
+   	   </c:if>
+  		   
+   	   
   		window.globalConfig = {
 	  		context: "${basePath}",
 	  		staticHost: "${staticHost}",
@@ -36,6 +37,21 @@
 	  		uploadPrivatePath:"${uploadPrivatePath}"
 	  	}
   		
+  		
+    	   <c:if test="${not empty adminData}">
+  		   window.adminData = {
+  	  		   mobile : "${adminData.mobile}" ,
+  	  		   name : "${adminData.name}",
+  	  		   email: "${adminData.email}",
+  	  		   createTime : "${adminData.createTime}"
+  		   }
+  	   </c:if>  	   
+    	   
+    	   <c:if test="${empty adminData}">
+    	    window.adminData = ""
+    	   </c:if> 
+    	 
+  		
   		<!--
   		<shiro:hasRole name="999999">
  		window.showSystem = true;