sop快捷显示更改

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBSopInfoServiceImpl.java

@@ -1138,10 +1138,12 @@ public class TBSopInfoServiceImpl extends ServiceImpl<TBSopInfoMapper, TBSopInfo
         LinkedHashMap<String, FlowTaskResult> setupMapNew = new LinkedHashMap<>(setupMap.size());
         for (Map.Entry<String, FlowTaskResult> entry : setupMap.entrySet()) {
             if (entry.getValue().getSetup().intValue() > 0) {
-                if (entry.getValue().getSetup().intValue() <= tfFlowApprove.getSetup().intValue()) {
+                if (tfFlowApprove.getSetup().intValue() != 0 && tfFlowApprove.getSetup().intValue() <= entry.getValue()
+                        .getSetup().intValue()) {
                     setupMapNew.put(entry.getKey(), entry.getValue());
-                } else {
                     break;
+                } else if (entry.getValue().getSetup().intValue() != tfFlowApprove.getSetup().intValue()) {
+                    setupMapNew.put(entry.getKey(), entry.getValue());
                 }
             }
         }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBUserArchivesAllocationServiceImpl.java

@@ -189,7 +189,7 @@ public class TBUserArchivesAllocationServiceImpl
             }
             if (CollectionUtils.isNotEmpty(removeList)){
                 this.remove(new QueryWrapper<TBUserArchivesAllocation>().lambda()
-                        .eq(TBUserArchivesAllocation::getArchivesId, removeList)
+                        .in(TBUserArchivesAllocation::getArchivesId, removeList)
                         .eq(TBUserArchivesAllocation::getCrmDetailId, crmDetailId));
             }
 

sop-business/src/main/resources/db/log/wangliang_update_log.sql

@@ -190,4 +190,7 @@ SET name='教务处SOP管理', url='office', `type`='MENU', parent_id=40, `seque
 WHERE id=41;
 UPDATE sys_privilege
 SET name='研究生SOP管理', url='cloudMark', `type`='MENU', parent_id=40, `sequence`=2, property=NULL, related='3034,3035,3091,3092,3093,2062', enable=1, default_auth=0, front_display=1
-WHERE id=42;
+WHERE id=42;
+
+ALTER TABLE t_b_sop_quick_search DROP KEY t_b_sop_quick_search_unique;
+ALTER TABLE t_b_sop_quick_search ADD CONSTRAINT t_b_sop_quick_search_unique UNIQUE KEY (`type`,name,content_type,user_id);