Merge pull request 'fix: 修改图鉴相似度列表' (#144) from fix/updatePictureSimilarity20240422 into test

Reviewed-on: #144

jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1561,9 +1561,20 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
 
         //补充历史状态名称，检查补充节点信息
         for (OcrTaskchildPictureAppro ocrTaskchildPictureAppro : list) {
+            String assignee = ocrTaskchildPictureAppro.getAssignee();
             //审批节点 当前如果没有历史操作，则将当前节点赋值到历史审批节点中.
             if (StringUtils.isBlank(ocrTaskchildPictureAppro.getTasknamehis())) {
                 ocrTaskchildPictureAppro.setTasknamehis(ocrTaskchildPictureAppro.getTaskname());
+            }else{
+                if (assignee.contains(",")) {
+                    String[] split = assignee.split(",");
+                    for (int i = 0; i < split.length; i++) {
+                        if (user.getLoginname().equals(split[i])) {
+                            String[] taskIds = ocrTaskchildPictureAppro.getTasknamehis().split(",");
+                            ocrTaskchildPictureAppro.setTasknamehis(taskIds[i]);
+                        }
+                    }
+                }
             }
 
             if (ocrTaskchildPictureAppro.getStatshis() != null) {

jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml

@@ -935,7 +935,6 @@
         FROM ocr_check_duplicate_result t1
                  LEFT JOIN ocr_picture t2 ON t1.picture_id = t2.ID
                  LEFT JOIN ocr_taskchild_picture t3 ON t2.ID = t3.PICTUREID
-                 left join ocr_picture_info t5 on t2.ID = t5.picture_id
         WHERE t1.check_duplicate_id = #{checkDuplicateId}
           and t2.suspiciousfile = 0
         <if test="pictureId != null and pictureId != ''">