解决合并冲突代码

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/SrvOrganEmpServiceImpl.java

@@ -125,8 +125,8 @@ public class SrvOrganEmpServiceImpl implements SrvOrganEmpService {
     @Override
     public int saveOrUpdateSrvOrganEmp(SrvOrganEmpVo srvOrganEmpVo) {
         Long empId = srvOrganEmpVo.getEmpId();
-        ChSrvOrganEmpApply chSrvOrganEmpApply = new ChSrvOrganEmpApply();
-        BeanUtils.copyProperties(srvOrganEmpVo, chSrvOrganEmpApply);
+        ChSrvOrganEmp chSrvOrganEmp = new ChSrvOrganEmp();
+        BeanUtils.copyProperties(srvOrganEmpVo, chSrvOrganEmp);
         int queryResult = 0;
         if (null == empId) {
             QueryWrapper<ChSrvOrganEmp> queryWrapper = new QueryWrapper<>();
@@ -134,23 +134,23 @@ public class SrvOrganEmpServiceImpl implements SrvOrganEmpService {
             queryWrapper.eq("IS_LOCK",0);
             queryResult = chSrvOrganEmpMapper.selectCount(queryWrapper);
             if(queryResult>0){
-               return queryResult;
+                return queryResult;
             }
             // 新增
-            chSrvOrganEmpApply.setEffTime(new Date());
-            chSrvOrganEmpApply.setIsLock((short) 0);
-            chSrvOrganEmpApplyMapper.insert(chSrvOrganEmpApply);
-            updateAttachs(srvOrganEmpVo, chSrvOrganEmpApply.getEmpId());
+            chSrvOrganEmp.setEffTime(new Date());
+            chSrvOrganEmp.setIsLock((short) 0);
+            chSrvOrganEmpMapper.insert(chSrvOrganEmp);
+            updateAttachs(srvOrganEmpVo, chSrvOrganEmp.getEmpId());
 
             ChSrvempRiskLevel chSrvempRiskLevel = new ChSrvempRiskLevel();
             chSrvempRiskLevel.setRiskLevel(0L);
-            chSrvempRiskLevel.setSrvEmpId(Long.valueOf(chSrvOrganEmpApply.getEmpId()));
+            chSrvempRiskLevel.setSrvEmpId(Long.valueOf(chSrvOrganEmp.getEmpId()));
             chSrvempRiskLevel.setStatus(0);
             chSrvempRiskLevel.setFcd(new Date());
             chSrvempRiskLevelMapper.insert(chSrvempRiskLevel);
         } else {
             // 修改
-            chSrvOrganEmpApplyMapper.updateById(chSrvOrganEmpApply);
+            chSrvOrganEmpMapper.updateById(chSrvOrganEmp);
             updateAttachs(srvOrganEmpVo, empId);
         }
         return queryResult;