Commit 32d1aff2 authored by 徐州's avatar 徐州

解决部分bug

parent fe6448a9
...@@ -357,8 +357,10 @@ public class CustomerWechat implements ICustomerWechat { ...@@ -357,8 +357,10 @@ public class CustomerWechat implements ICustomerWechat {
try { try {
House365RestObject<CustomerEntity> data = doGetHotLineCustomer(map); House365RestObject<CustomerEntity> data = doGetHotLineCustomer(map);
if(entity.getShowMobile() != 1) { if(entity.getShowMobile() != 1) {
if(data != null && data.getEntity() != null) {
data.getEntity().setPhone(MobileUtil.hidePhone(data.getEntity().getPhone())); data.getEntity().setPhone(MobileUtil.hidePhone(data.getEntity().getPhone()));
} }
}
response.setResult(ReturnAppResult.APP_SUCCESS.getResultCode()); response.setResult(ReturnAppResult.APP_SUCCESS.getResultCode());
response.setMsg(ReturnAppResult.APP_SUCCESS.getResultMessage()); response.setMsg(ReturnAppResult.APP_SUCCESS.getResultMessage());
response.setData(data); response.setData(data);
...@@ -1824,10 +1826,15 @@ public class CustomerWechat implements ICustomerWechat { ...@@ -1824,10 +1826,15 @@ public class CustomerWechat implements ICustomerWechat {
// 取得所需参数 // 取得所需参数
Map<String, Object> map = parameter.getArgs(); Map<String, Object> map = parameter.getArgs();
House365RestResponse<CustomerEntity> response = new House365RestResponse<>(); House365RestResponse<CustomerEntity> response = new House365RestResponse<>();
String phone = getMapValueByKey(Constant.CUSTOMER_PHONE, map, "");
UserEntity entity = getUserEntity(phone);
// 业务层统一处理 // 业务层统一处理
try { try {
House365RestObject<CustomerEntity> data = doGetManagers(map); House365RestObject<CustomerEntity> data = doGetManagers(map);
if(entity.getShowMobile() != 1) {
data.getEntity().setPhone(MobileUtil.hidePhone(data.getEntity().getPhone()));
}
response.setResult(ReturnAppResult.APP_SUCCESS.getResultCode()); response.setResult(ReturnAppResult.APP_SUCCESS.getResultCode());
response.setMsg(ReturnAppResult.APP_SUCCESS.getResultMessage()); response.setMsg(ReturnAppResult.APP_SUCCESS.getResultMessage());
response.setData(data); response.setData(data);
......
...@@ -278,8 +278,10 @@ public class ProjectWechat implements IProjectWechat { ...@@ -278,8 +278,10 @@ public class ProjectWechat implements IProjectWechat {
try { try {
House365RestObject<CustomerEntity> data = doGetCustomers(map); House365RestObject<CustomerEntity> data = doGetCustomers(map);
if(entity.getShowMobile() != 1) { if(entity.getShowMobile() != 1) {
if(data != null && data.getEntity() != null) {
data.getEntity().setPhone(MobileUtil.hidePhone(data.getEntity().getPhone())); data.getEntity().setPhone(MobileUtil.hidePhone(data.getEntity().getPhone()));
} }
}
response.setResult(ReturnAppResult.APP_SUCCESS.getResultCode()); response.setResult(ReturnAppResult.APP_SUCCESS.getResultCode());
response.setMsg(ReturnAppResult.APP_SUCCESS.getResultMessage()); response.setMsg(ReturnAppResult.APP_SUCCESS.getResultMessage());
response.setData(data); response.setData(data);
......
...@@ -772,7 +772,7 @@ ...@@ -772,7 +772,7 @@
<bean id="addMarketActivity" class="org.springframework.scheduling.quartz.CronTriggerBean"> <bean id="addMarketActivity" class="org.springframework.scheduling.quartz.CronTriggerBean">
<property name="jobDetail" ref="addMarketCus"/> <property name="jobDetail" ref="addMarketCus"/>
<property name="cronExpression" value="0 10 3 * * ? *"/> <property name="cronExpression" value="0 10 0 * * ? *"/>
</bean> </bean>
<bean id="addMarketCus" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean"> <bean id="addMarketCus" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment