修改不兼容文件

src/com/ejweb/modules/call/api/CallController.java

@@ -190,13 +190,13 @@ public class CallController {
             record.setCreateBy(bean.getCreateBy());
             if(StringUtils.isEmpty(bean.getCreateName())){
                 String name = callService.getNameByPhoneFromSeat(bean.getCreatePhone());
-            	if(name!=null){
+                if (name != null) {
                     record.setCreateName(name);
-            	}else{
+                } else {
                     name = callService.getNameByPhone(bean.getCreatePhone());
-            		if(name!=null){
+                    if (name != null) {
                         record.setCreateName(name);
-            		}else{
+                    } else {
                         record.setCreateName(bean.getCreatePhone());
                     }
                 }
@@ -236,7 +236,7 @@ public class CallController {
 
                     phone.setTitle(record.getCreateName());
                 }
-                if(StringUtils.isEmpty(phone.getUserId()) 
+                if (StringUtils.isEmpty(phone.getUserId())
                         && StringUtils.isNotEmpty(phone.getPhone())){// 如果没有匹配用户信息则通过号码匹配用户信息
 
                     CallFindPhoneInfoBean phoneBean = new CallFindPhoneInfoBean();
@@ -326,18 +326,18 @@ public class CallController {
 
         String message = callService.validate(bean);
         if (message == null) {// 校验通过
-           Boolean show=false;
-           UserEntity ue=new UserEntity();
+            Boolean show = false;
+            UserEntity ue = new UserEntity();
             ue.setUsercode(bean.getUserId());
             User user = userService.getUserByUserCode(ue);
-           if(user!=null){
-               if(StringUtils.isNoneBlank(user.getPhone())){
-                   show=true;
+            if (user != null) {
+                if (StringUtils.isNoneBlank(user.getPhone())) {
+                    show = true;
                 }
-           }else{
-               UserSeatEntity seat= userService.getSeatsEntity(bean.getUserId());
-               if(seat != null && StringUtils.isNoneBlank(seat.getPhone())){
-                   show=true;
+            } else {
+                UserSeatEntity seat = userService.getSeatsEntity(bean.getUserId());
+                if (seat != null && StringUtils.isNoneBlank(seat.getPhone())) {
+                    show = true;
                 }
             }
             PageEntity<CallRecordListEntity> page = callService.getCallRecordList(bean);
@@ -425,7 +425,7 @@ public class CallController {
                 }
                 if(StringUtils.isNotEmpty(record.getPhone())
                         && record.getPhone().startsWith("6")
-                          && record.getPhone().length() == 4){// 6开头的华为短号不展示
+                        && record.getPhone().length() == 4) {// 6开头的华为短号不展示
 
                     record.setPhone("");
                 }
@@ -692,25 +692,25 @@ public class CallController {
             record.setCallType("USER");
             String name = callService.getNameByPhoneFromSeat(bean.getCallNo());
             String id = callService.getIdByPhoneFromSeat(bean.getCallNo());
-            	if(name!=null){
+            if (name != null) {
                 record.setCreateName(name);
                 record.setCreateBy(id);
-            	}else{
+            } else {
                 name = callService.getNameByPhone(bean.getCallNo());
-            		if(name!=null){
+                if (name != null) {
                     id = callService.getIdByPhone(bean.getCallNo());
                     record.setCreateName(name);
                     record.setCreateBy(id);
-            		}else{
+                } else {
                     record.setCreateName(bean.getCallNo());
                     record.setCreateBy("1");
                 }
             }
             int userCount = 1;
-            	if(bean.getResult()!=null && !bean.getResult().equals("0")){
+            if (bean.getResult() != null && !bean.getResult().equals("0")) {
                 record.setEndStatus("SUCCESS");
                 userCount = 2;
-            	}else{
+            } else {
                 record.setEndStatus("FAILD");
             }
             record.setId(IdWorker.getNextId());
@@ -745,16 +745,16 @@ public class CallController {
             }
             String acceptName = callService.getNameByPhoneFromSeat(bean.getAcceptNo());
             String acceptId = callService.getIdByPhoneFromSeat(bean.getAcceptNo());
-            	if(acceptName!=null){
+            if (acceptName != null) {
                 phone.setUserId(acceptId);
                 phone.setUsername(acceptName);
-            	}else{
+            } else {
                 acceptName = callService.getNameByPhone(bean.getAcceptNo());
-            		if(acceptName!=null){
+                if (acceptName != null) {
                     acceptId = callService.getIdByPhone(bean.getAcceptNo());
                     phone.setUserId(acceptId);
                     phone.setUsername(acceptName);
-            		}else{
+                } else {
                     phone.setUserId("1");
                     phone.setUsername(bean.getAcceptNo());
                 }

src/com/ejweb/modules/call/service/CallService.java

@@ -105,7 +105,7 @@ public class CallService extends BaseService<CallDao> {
         PageHelper.startPage(bean.getPageNo(), bean.getPageSize());
         pageInfo = new PageInfo<CallRecordListEntity>(dao.getCallSoundList(bean));
 
-      if(pageInfo.getPages()<bean.getPageNo()){// 页码大于总页数，则返回NULL
+        if (pageInfo.getPages() < bean.getPageNo()) {// 页码大于总页数，则返回NULL
 
             return null;
         }
@@ -367,7 +367,6 @@ public class CallService extends BaseService<CallDao> {
 //    }
 
 
-    
     public List<MemberEntity> getMemberList(String id) {
         return  dao.getMemberList( id);
     }