薪资单临时方案问题修复2

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerBasicInfoServiceImpl.java

@@ -138,7 +138,7 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
         Long practitionerId = requestVO.getPractitionerId();
         Map<Long,PayScaleInfo> payScaleInfoMap = new HashMap<>();
 
-        if(!Strings.isNullOrEmpty(practitionerIdEG) && practitionerId != null){
+        if(!Strings.isNullOrEmpty(practitionerIdEG)){
             List<PayScaleInfo> payScaleInfoListAll =  aclPractitionerDALService.findPayScaleByPractitionerEG(practitionerIdEG);
             if(!payScaleInfoListAll.isEmpty()){
                 Map<String,String> dtlTypeMap = new HashMap<>();
@@ -170,22 +170,18 @@ public class PractitionerBasicInfoServiceImpl implements PractitionerBasicInfoSe
                 }
 
             }
+        }
+        List<PayScaleInfo> resultList = new ArrayList<>(payScaleInfoMap.values());
 
-            List<PayScaleInfo> resultList = new ArrayList<>(payScaleInfoMap.values());
-
-            // 加入临时薪资表的数据
-            List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerId(practitionerId);
-            translateObj(list, resultList);
+        // 加入临时薪资表的数据
+        List<AgAclLifePractitionerSalary> list = practitionerSalaryMapper.queryListByPractitionerId(practitionerId);
+        translateObj(list, resultList);
 
-            // 排序
-            resultList.sort(Comparator.comparingLong(PayScaleInfo :: getMonDtlPeriod).reversed());
-            responseVO.setPayScaleInfos(resultList);
+        // 排序
+        resultList.sort(Comparator.comparingLong(PayScaleInfo :: getMonDtlPeriod).reversed());
+        responseVO.setPayScaleInfos(resultList);
 
-            responseVO.setCommonResult(new CommonResult(true,ZHBErrorConfig.getErrorInfo("800000")));
-        }else{
-            String[] params = {"practitionerIdEG, practitionerId"};
-            responseVO.setCommonResult(new CommonResult(false, ZHBErrorConfig.getErrorInfo("610002", params)));
-        }
+        responseVO.setCommonResult(new CommonResult(true,ZHBErrorConfig.getErrorInfo("800000")));
         return responseVO;
     }