修改判断

house365-hgs-web/src/main/java/com/house365/web/controller/CallbackRecordController.java

@@ -101,7 +101,7 @@ public class CallbackRecordController extends BaseController {
         /**
          * 用户无权查看完整手机号
          */
-        if(userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             entities = entities.stream().map(i-> {
                 i.setPhone(MobileUtil.hidePhone(i.getPhone()));
                 return i;

house365-hgs-web/src/main/java/com/house365/web/controller/CloudCustomerController.java

@@ -82,7 +82,7 @@ public class CloudCustomerController extends BaseController {
             MapListResponse response = cloudCustomerInterface.list(listRequest, activeId);
 
             List<Map<String, Object>> objectList = response.getObjectList();
-            if(userEntity.getShowMobile() != 1) {
+            if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
                 for (Map<String, Object> i : objectList) {
                     if(i != null && i.containsKey("phone")) {
                        i.replace("phone",MobileUtil.hidePhone(String.valueOf(i.get("phone"))));

house365-hgs-web/src/main/java/com/house365/web/controller/CustomerController.java

@@ -1146,7 +1146,7 @@ public class CustomerController extends BaseController {
         /**
          * 用户无权查看完整手机号
          */
-        if(userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             customerEntity.setPhone(MobileUtil.hidePhone(customerEntity.getPhone()));
         }
 
@@ -1912,7 +1912,7 @@ public class CustomerController extends BaseController {
         /**
          * 用户无权查看完整手机号
          */
-        if(userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             customers = customers.stream().map(i-> {
                 i.setPhone(MobileUtil.hidePhone(i.getPhone()));
                 return i;
@@ -2269,7 +2269,7 @@ public class CustomerController extends BaseController {
         /**
          * 用户无权查看完整手机号
          */
-        if(userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             customers = customers.stream().map(i-> {
                 i.setPhone(MobileUtil.hidePhone(i.getPhone()));
                 return i;
@@ -2480,7 +2480,7 @@ public class CustomerController extends BaseController {
         // 处理前台显示客户类型
         handleDisplayCustomerType(ce);
 
-        if(userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             ce.setPhone(MobileUtil.hidePhone(ce.getPhone()));
         }
         model.addAttribute("entity", cp);
@@ -3043,7 +3043,7 @@ public class CustomerController extends BaseController {
         List<CustomerCallbackLogEntity> backLogList = customerCallbackLog.queryByConditions(cpMap);
 
         userEntity.setCity(cityCode);
-        if(userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             customerEntity.setPhone(MobileUtil.hidePhone(customerEntity.getPhone()));
         }
         model.addAttribute("action", action);

house365-hgs-web/src/main/java/com/house365/web/controller/CustomerManagementController.java

@@ -903,7 +903,7 @@ public class CustomerManagementController extends BaseController {
         /**
          * 用户无权查看完整手机号
          */
-        if(userEntity.getShowMobile() != null && userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             customers = customers.stream().map(i-> {
                 i.setPhone(MobileUtil.hidePhone(i.getPhone()));
                 return i;
@@ -1440,7 +1440,7 @@ public class CustomerManagementController extends BaseController {
             MapListResponse response = customer.successList(listRequest, userEntity);
 
             List<Map<String, Object>> objectList = response.getObjectList();
-            if(userEntity.getShowMobile() != 1) {
+            if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
                 for (Map<String, Object> i : objectList) {
                     if(i != null && i.containsKey("phone")) {
                         i.replace("phone",MobileUtil.hidePhone(String.valueOf(i.get("phone"))));

house365-hgs-web/src/main/java/com/house365/web/controller/ExternalCustomerController.java

@@ -188,7 +188,7 @@ public class ExternalCustomerController extends BaseController {
             }
         }
 
-        if(userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             entity.setPhone(MobileUtil.hidePhone(entity.getPhone()));
         }
 
@@ -272,7 +272,7 @@ public class ExternalCustomerController extends BaseController {
             MapListResponse response = customerInterface.list(listRequest);
 
             List<Map<String, Object>> objectList = response.getObjectList();
-            if(userEntity.getShowMobile() != 1) {
+            if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
                 for (Map<String, Object> i : objectList) {
                     if(i != null && i.containsKey("phone")) {
                         i.replace("phone",MobileUtil.hidePhone(String.valueOf(i.get("phone"))));

house365-hgs-web/src/main/java/com/house365/web/controller/MarketCustomerController.java

@@ -302,7 +302,7 @@ public class MarketCustomerController extends BaseController {
         /**
          * 用户无权查看完整手机号
          */
-        if(userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             marketCustomers = marketCustomers.stream().map(i-> {
                 i.setPhone(MobileUtil.hidePhone(i.getPhone()));
                 return i;

house365-hgs-web/src/main/java/com/house365/web/controller/PlatformManagementController.java

@@ -423,7 +423,7 @@ public class PlatformManagementController extends BaseController {
         /**
          * 用户无权查看完整手机号
          */
-        if(userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             customers = customers.stream().map(i-> {
                 i.setPhone(MobileUtil.hidePhone(i.getPhone()));
                 return i;
@@ -723,7 +723,7 @@ public class PlatformManagementController extends BaseController {
             model.addAttribute("displayBackToSeaDate", displayBackToSeaDate);
         }
         userEntity.setCity(cityCode);
-        if(userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             customerEntity.setPhone(MobileUtil.hidePhone(customerEntity.getPhone()));
         }
 

house365-hgs-web/src/main/java/com/house365/web/controller/PropertyReportController.java

@@ -79,7 +79,7 @@ public class PropertyReportController extends BaseController {
             MapListResponse response = reportInterface.list(listRequest);
 
             List<Map<String, Object>> objectList = response.getObjectList();
-            if(userEntity.getShowMobile() != 1) {
+            if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
                 for (Map<String, Object> i : objectList) {
                     if(i != null && i.containsKey("phone")) {
                         i.replace("phone",MobileUtil.hidePhone(String.valueOf(i.get("phone"))));
@@ -105,7 +105,7 @@ public class PropertyReportController extends BaseController {
     public String toAdd(Model model, @PathVariable int customerId,HttpServletRequest request) {
         UserEntity userEntity = (UserEntity) request.getSession().getAttribute(SessionConstants.THREAD_USER_KEY);
         CustomerEntity entity = customer.queryById(customerId);
-        if(userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             entity.setPhone(MobileUtil.hidePhone(entity.getPhone()));
         }
         model.addAttribute("data", entity);
@@ -195,7 +195,7 @@ public class PropertyReportController extends BaseController {
             report.setChannel(channel);
             model.addAttribute("report", report);
         }
-        if(userEntity.getShowMobile() != 1) {
+        if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
             entity.setPhone(MobileUtil.hidePhone(entity.getPhone()));
         }
         model.addAttribute("data", entity);

house365-hgs-web/src/main/java/com/house365/web/controller/StatisticController.java

@@ -3554,7 +3554,7 @@ public class StatisticController extends BaseController {
             listRequest.setSearchParams(searchParams);
             MapListResponse response = customerProject.list(listRequest, city, startTime, endTime);
             List<Map<String, Object>> objectList = response.getObjectList();
-            if(userEntity.getShowMobile() != 1) {
+            if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
                 for (Map<String, Object> i : objectList) {
                     if(i != null && i.containsKey("phone")) {
                         i.replace("phone",MobileUtil.hidePhone(String.valueOf(i.get("phone"))));

house365-hgs-ws/src/main/java/com/house365/ws/interfaces/rest/CustomerWechat.java

@@ -1200,7 +1200,7 @@ public class CustomerWechat implements ICustomerWechat {
             }
 
             House365RestObject object = new House365RestObject();
-            if(userEntity.getShowMobile() != 1) {
+            if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
                 customers = customers.stream().map(i-> {
                     i.setPhone(MobileUtil.hidePhone(i.getPhone()));
                     return i;
@@ -1546,7 +1546,7 @@ public class CustomerWechat implements ICustomerWechat {
             }
 
             House365RestObject object = new House365RestObject();
-            if(userEntity.getShowMobile() != 1) {
+            if(userEntity.getShowMobile() == null || userEntity.getShowMobile() != 1) {
                 customerVOList = customerVOList.stream().map(i-> {
                     i.setPhone(MobileUtil.hidePhone(i.getPhone()));
                     return i;