Compare commits

..

No commits in common. 'f2a5fa79e571d38df239582c7693c32fc6419659' and '44dfc3e8546bc4e15134cda825a5903e3191493e' have entirely different histories.

  1. 19
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/task/controller/TaskController.java

@ -234,25 +234,6 @@ public class TaskController extends JeecgController<Task, ITaskService> {
if (task == null) {
return Result.error("未找到对应数据");
}
if (StringUtils.isNotBlank(task.getUpperId())) {
Task taskUpper = taskService.getById(task.getUpperId());
if (ObjectUtils.isNotEmpty(taskUpper)) {
task.setUpperTaskName(taskUpper.getTaskName());
}
}
if (task.getTaskFile()!=null&& !task.getTaskFile().equals("")){
task.setContentType("file");
}else if(task.getTaskPic()!=null&& !task.getTaskPic().equals("")){
task.setContentType("image");
}else{
task.setContentType("text");
}
String managerUsers = task.getManagerUsers();
if (managerUsers!=null&&!managerUsers.equals("")) {
SysUser byId = iSysUserService.getById(managerUsers);
if (byId!=null)
task.setHeadpic(byId.getAvatar());
}
return Result.OK(task);
}

Loading…
Cancel
Save