Browse Source

修改联系人列表显示

anderx 7 years ago
parent
commit
1d64741c2c

+ 4 - 0
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -344,6 +344,10 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		if (StringUtils.isNotBlank(roleName)) params.put("roleName", roleName);
 		params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		Pagination<AdminListBo> p = (Pagination<AdminListBo>)findPage("frequentContactsList", "frequentContactsCount", params, pageNo, pageSize);
+		List<AdminListBo> list=(List<AdminListBo>)p.getList();
+		for(AdminListBo i:list){
+			i.setRoles(adminMapper.selectRolesByUid(i.getContactId()));
+		}
 		return p;
 	}
 

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

@@ -997,7 +997,7 @@
   </insert>
   
    <select id="frequentContactsList" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
-  	 select a.id,b.id as contactId,b.name,b.position,b.contact_mobile as contactMobile,c.name as departmentName
+  	 select a.id,b.id as contactId,b.name,b.position,b.contact_mobile as contactMobile,c.name as departmentName,y.role_name as roleName
     from admin_contacts a left join admin b 
     on a.contacts_id=b.id left join department c 
     on c.id=b.department_id left join user_role x on x.uid=b.id

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

@@ -1169,7 +1169,7 @@
   	and dep.id = #{depId,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and a.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   	order by 
   	<if test="specially == 4">
@@ -1247,7 +1247,7 @@
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and a.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   </select>
   

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,7 +1,7 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #\u6570\u636e\u5e93\u94fe\u63a5\uff0c
-jdbc.url=jdbc\:mysql\://192.168.0.198\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+jdbc.url=jdbc\:mysql\://192.168.0.99\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
 #\u5e10\u53f7
 jdbc.username=dev
 #\u5bc6\u7801
@@ -40,7 +40,7 @@ jdbc.filters=stat
 
 logging.level.com.goafanti=DEBUG
 
-jedis.host=192.168.0.198
+jedis.host=192.168.0.99
 jedis.port=6379
 jedis.timeout=5000
 jedis.password=aft123456