fix委托审核如果是管理员操作审核通过

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/controller/ItdmWeituoInfoController.java

@@ -333,21 +333,35 @@ public class ItdmWeituoInfoController extends JeecgController<ItdmWeituoInfo, II
                     columnMap.put("weituo_id", weituoInfo.getId());
                     columnMap.put("task_user", realName);
                     List<ItdmTask> taskList = taskService.listByMap(columnMap);
-                    if (taskList != null) {
+
+                    if (taskList!=null && !taskList.isEmpty()) {
                         ItdmTask itdmTask1 = taskList.get(0);
-                        itdmTask1.setTaskStatus(1);
+                        itdmTask1.setTaskStatus(1);//已完成
                         taskService.updateById(itdmTask1);
-                    }
-
-                    //删除该委托单其他经理状态为待办的task
-                    Map<String, Object> deleteMap = new HashMap<>();
-                    deleteMap.put("task_role",GlobalVariables.jl);//”经理“
-                    columnMap.put("weituo_id", weituoInfo.getId());
-                    deleteMap.put("task_status",0);
-                    taskService.removeByMap(deleteMap);
-
-
 
+                        //删除该委托单其他经理状态为待办的task
+                        Map<String, Object> deleteMap = new HashMap<>();
+                        deleteMap.put("task_role",GlobalVariables.jl);//”经理“
+                        columnMap.put("weituo_id", weituoInfo.getId());
+                        deleteMap.put("task_status",0);
+                        taskService.removeByMap(deleteMap);
+                    }else {
+                        //删除该委托单所有经理的状态为待办的task
+                        Map<String, Object> deleteMap = new HashMap<>();
+                        deleteMap.put("task_role",GlobalVariables.jl);//”经理“
+                        columnMap.put("weituo_id", weituoInfo.getId());
+                        deleteMap.put("task_status",0);
+                        taskService.removeByMap(deleteMap);
+
+                        //新增一条当前登录用户作为经理职责的状态为已完成任务
+                        ItdmTask itdmTask = new ItdmTask();
+                        itdmTask.setTaskUser(realName);
+                        itdmTask.setTaskRole(GlobalVariables.jl);//经理
+                        itdmTask.setTaskStatus(1);//已完成
+                        itdmTask.setTaskContent(GlobalVariables.wtsh);//委托审核
+                        itdmTask.setWeituoId(weituoInfo.getId());
+                        taskService.save(itdmTask);
+                    }
                 }else if (weituoInfo.getShenheStatus().equals("2")) { //审核拒绝
                     //删掉所有该委托id对应的“审核”的任务
                     Map<String, Object> deleteMap = new HashMap<>();