Merge remote-tracking branch 'origin/main'

project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java

@@ -3985,7 +3985,7 @@ public class TaskServiceImpl implements ITaskService {
                     filePermissions.add(item2);
                 }
             }
-            batchUpdatePermission(filePermissions);
+
 
             // 新增拓展属性
             List<SimulationTaskExtra> extraList = req.getExtras();
@@ -4065,6 +4065,7 @@ public class TaskServiceImpl implements ITaskService {
                     }
                 }
             }
+            batchUpdatePermission(filePermissions);
         }
         return SdmResponse.success();
     }

project/src/main/resources/mapper/SimulationProjectMapper.xml

@@ -580,7 +580,7 @@
         </if>
         <if test="name != null and name != ''">
             <bind name="searchKey" value="'%' + name+ '%'"/>
-            and nodeName #{searchKey}
+            and nodeName like #{searchKey}
         </if>
         order by createTime desc
     </select>

project/src/main/resources/mapper/SimulationTaskMapper.xml

@@ -206,7 +206,7 @@
         </if>
         <if test="req.taskName != null and req.taskName != ''">
             <bind name="searchKey1" value="'%' + req.taskName + '%'"/>
-            and task_name like #{searchKey}
+            and task_name like #{searchKey1}
         </if>
         <if test="req.name != null and req.name != ''">
             <bind name="searchKey2" value="'%' + req.name + '%'"/>