Просмотр исходного кода

1、经理查看六要素
2、管理员新增公出审核人员
3、公出打卡列表修改审核列表
4、修改项目统计列表

anderx лет назад: 4
Родитель
Сommit
6f13f8acb3

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

@@ -272,7 +272,7 @@
       a.contact_type contactType,a.follow_name followName ,a.follow_dep followDep,a.`result` ,a.follow_count followCount,
       date_format(a.create_time ,'%Y-%m-%d %H:%i:%s')followTimes,a.guidance_name guidanceName, a.guidance ,
       date_format(a.guidance_time,'%Y-%m-%d %H:%i:%s') guidanceTimes,c.contacts ,c.contact_mobile contactMobile,
-      c.location_province locationProvince ,c.location_city locationCity ,c.location_area locationArea,
+      c.location_province province ,c.location_city city ,c.location_area area,
       c.intended_project intendedProject ,c.business_scope businessScope
       from user_follow a left join `user`b on a.uid =b.id left join organization_identity c on a.uid=c.uid
       where 1=1

+ 6 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

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

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

@@ -48,7 +48,7 @@ avatar.upload.host=//sb.jishutao.com/upload
 #avatar.host=//172.16.0.253
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.90
+static.host=//static.jishutao.com/1.1.91
 
 wx.appId=wxff2f5720ed7d7f63
 wx.appSecret=081744369d42405be58fe37f892631f7

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -41,7 +41,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.90
+static.host=//static.jishutao.com/1.1.91
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload