Browse Source

update

Signed-off-by: anderx <anderx@qq.com>
anderx 5 years ago
parent
commit
5d43359701

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

@@ -463,10 +463,10 @@
 		from department
 		where
 		status ='0'
+		order by CONVERT (name USING gbk)
 		<if test="sort ==1" >
 		limit 10	
 		</if>
-		order by CONVERT (name USING gbk)
 	</select>
 	<insert id="insert1" parameterType="com.goafanti.organization.bo.OrganizationListOut">
 		insert into department(

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

@@ -846,7 +846,8 @@
 	
 	<select id="findCustomerContacts" parameterType="java.lang.String" resultType="com.goafanti.common.model.OrganizationContactBook">
 	select a.id,a.name,a.mobile,a.email,a.qq,a.wechat,a.department,a.position,a.major,a.fixed_tel fixedTel,a.aname,b.location_province,
-	d1.name provinceName,d2.name cityName,d3.name areaName,date_format(a.create_time,'%Y-%m-%d')createTimes from organization_contact_book a 
+	d1.name provinceName,d2.name cityName,d3.name areaName,date_format(a.create_time,'%Y-%m-%d')createTimes,aid 
+	from organization_contact_book a 
 	left join organization_identity b on a.uid=b.uid left join district_glossory d1 on b.location_province=d1.id 
 	left join district_glossory d2 on b.location_city=d2.id left join district_glossory d3 on b.location_area=d3.id 
 		where a.uid = #{uid,jdbcType=VARCHAR} order by a.create_time desc

+ 8 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -507,7 +507,14 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public List<OrganizationContactBook> findCustomerContacts(String uid) {
-		return userMapper.findCustomerContacts(uid,TokenManager.getAdminId());
+		List<OrganizationContactBook> list=userMapper.findCustomerContacts(uid,TokenManager.getAdminId());
+			for (OrganizationContactBook orgBook : list) {
+				if (!TokenManager.getAdminId().equals(orgBook.getAid())) {
+					orgBook.setName("***");
+					orgBook.setMobile("***");
+				}
+			}
+		return list; 
 	}
 
 	@Override