|
@@ -134,7 +134,11 @@ public class MobileTaskServiceImpl implements MobileTaskService {
|
|
|
map.put("lasttask", null);
|
|
map.put("lasttask", null);
|
|
|
}
|
|
}
|
|
|
if (!CollectionUtils.isEmpty(lastProcess)) {
|
|
if (!CollectionUtils.isEmpty(lastProcess)) {
|
|
|
- map.put("lastProcess", lastProcess.get(0).getDealname() + "的" + lastProcess.get(0).getCaller());
|
|
|
|
|
|
|
+ if (lastProcess.get(0).getDealname() != null) {
|
|
|
|
|
+ map.put("lastProcess", lastProcess.get(0).getDealname() + "的" + lastProcess.get(0).getCaller());
|
|
|
|
|
+ } else {
|
|
|
|
|
+ map.put("lastProcess", lastProcess.get(0).getCaller());
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
map.put("lastProcess", null);
|
|
map.put("lastProcess", null);
|
|
|
}
|
|
}
|