会服 - 绑定管理员 更改显示userName 2 nickName

src/main/java/com/ctrip/fun/golf/dao/adminUser/AdminAuthorityDao.java

@@ -37,12 +37,12 @@ public class AdminAuthorityDao extends GenericHibernateDao<AdminAuthority, Integ
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	public List<AdminUserBean> getCommuneAdmUserList() {
 	public List<AdminUserBean> getCommuneAdmUserList() {
 		StringBuffer sql =  new StringBuffer();
 		StringBuffer sql =  new StringBuffer();
-		sql.append(" SELECT DISTINCT a.id ,a.nickName userName");
+		sql.append(" SELECT DISTINCT a.username userName,a.nickName");
 		sql.append(" FROM adm_users a JOIN adm_authorities b ON a.id = b.userId");
 		sql.append(" FROM adm_users a JOIN adm_authorities b ON a.id = b.userId");
 		sql.append(" WHERE 1=1  AND a.enable=1");
 		sql.append(" WHERE 1=1  AND a.enable=1");
 		sql.append("  AND b.authority IN('ROLE_COMMUNE','ROLE_PROMOTION')");
 		sql.append("  AND b.authority IN('ROLE_COMMUNE','ROLE_PROMOTION')");
 		
 		
-		Query q = this.getSession().createSQLQuery(sql.toString()).addScalar("id", StandardBasicTypes.INTEGER).addScalar("userName", StandardBasicTypes.STRING).setResultTransformer(Transformers.aliasToBean(AdminUserBean.class));
+		Query q = this.getSession().createSQLQuery(sql.toString()).addScalar("nickName", StandardBasicTypes.STRING).addScalar("userName", StandardBasicTypes.STRING).setResultTransformer(Transformers.aliasToBean(AdminUserBean.class));
 		List<AdminUserBean> queryResult = q.list();
 		List<AdminUserBean> queryResult = q.list();
 		
 		
 		return queryResult;
 		return queryResult;

src/main/java/com/ctrip/fun/golf/dao/user/CommuneAdmDao.java

@@ -30,7 +30,7 @@ public class CommuneAdmDao  extends GenericHibernateDao<CommuneAdm, Integer>{
 	public  PagedEntityBean<CommuneAdmBean> queryAdmBeanList(Object obj) {
 	public  PagedEntityBean<CommuneAdmBean> queryAdmBeanList(Object obj) {
     	CommuneAdmQuery query = (CommuneAdmQuery) obj;
     	CommuneAdmQuery query = (CommuneAdmQuery) obj;
         StringBuffer sb = new StringBuffer();
         StringBuffer sb = new StringBuffer();
-        sb.append("SELECT sql_calc_found_rows a.id,a.uid,a.id as communeExtId,a.drawer,a.mobilePhone,a.userName,a.birthday,c.vipGrade,c.communeAgainTime,d.username AS bindedAdm,b.bindTime,b.labels,a.customerRegion ,a.checkedRegion ");
+        sb.append("SELECT sql_calc_found_rows a.id,a.uid,a.id as communeExtId,a.drawer,a.mobilePhone,a.userName,a.birthday,c.vipGrade,c.communeAgainTime,d.nickName AS bindedAdm,b.bindTime,b.labels,a.customerRegion ,a.checkedRegion ");
         sb.append(" FROM usr_commune_ext a LEFT JOIN usr_commune_adm b ON a.id  = b.communeExtId");
         sb.append(" FROM usr_commune_ext a LEFT JOIN usr_commune_adm b ON a.id  = b.communeExtId");
         sb.append(" LEFT JOIN bsc_userext c ON a.uid = c.uid");
         sb.append(" LEFT JOIN bsc_userext c ON a.uid = c.uid");
         sb.append(" LEFT JOIN adm_users d ON b.admUserId = d.id");
         sb.append(" LEFT JOIN adm_users d ON b.admUserId = d.id");