Преглед на файлове

Merge branch 'test2' of jishutao/kede-server into prod

anderx преди 6 месеца
родител
ревизия
b6e92287af
променени са 1 файла, в които са добавени 5 реда и са изтрити 1 реда
  1. 5 1
      src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

+ 5 - 1
src/main/java/com/goafanti/techproject/service/impl/TaskDetailsServiceImpl.java

@@ -136,7 +136,11 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
             }
         }
         TTaskMember tTaskMember = ttaskMemberMapper.selectByTid(tOrderTask.getId());
-        String serviceYear = getServiceYer(tTaskMember.getServiceYear());
+        String serviceYear ="";
+        if (tTaskMember != null){
+            serviceYear =  tTaskMember.getServiceYear();
+            serviceYear = getServiceYer(serviceYear);
+        }
         if (StringUtils.isEmpty(bo.getTaskName())){
             bo.setTaskName(mid.getSalesmanName());
         }