Browse Source

feature 解决任务没有tenantid的问题

xiahan 10 months ago
parent
commit
1edb2b0bcb

+ 2 - 0
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/CheckTemplateServiceImpl.java

@@ -633,6 +633,7 @@ public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateDao, Chec
                         checkItemDo.setCheckworkspart(aspRiskUnitDo.getResponsibledeptid());
                         checkItemDo.setCheckresult("20");
                         checkItemDo.setCheckstatus(THEME_CHECK_STATUS_WAIT);
+                        checkItemDo.setTenantid(checkTemplateDo.getTenantid());
                         themeCheckItemSaveDos.add(checkItemDo);
                         int finalI = i;
                         items = entry.getValue().stream()
@@ -653,6 +654,7 @@ public class CheckTemplateServiceImpl extends ServiceImpl<CheckTemplateDao, Chec
                             themeCheckContentDo.setCheckmethod(items.get(j).getChecktype());
                             themeCheckContentDo.setCheckcontent(items.get(j).getCheckcontent());
                             themeCheckContentDo.setManagement(items.get(j).getManagement());
+                            themeCheckContentDo.setTenantid(checkTemplateDo.getTenantid());
                             themeCheckContentDos.add(themeCheckContentDo);
                         }
                     }

+ 3 - 1
js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/HazardInvestigationServiceImpl.java

@@ -124,6 +124,7 @@ public class HazardInvestigationServiceImpl implements HazardInvestigationServic
 
             apsDetailsHazardInvestigationTasksDo.setPlannedstarttime(startTime);
             apsDetailsHazardInvestigationTasksDo.setPlannedendtime(endTime);
+            apsDetailsHazardInvestigationTasksDo.setTenantid(tempData.getTenantid());
             taskSaveList.add(apsDetailsHazardInvestigationTasksDo);
             taskDetailSaveList.addAll(assembleTaskDetails(currentUser, apsDetailsHazardInvestigationTasksDo, checkItemList));
         }
@@ -160,7 +161,8 @@ public class HazardInvestigationServiceImpl implements HazardInvestigationServic
             apsHazardInvestigationTemplateZibiaoDo.setClassificationofcontrolmeasures2(s.getClassificationofcontrolmeasures2());
             apsHazardInvestigationTemplateZibiaoDo.setDescriptionofcontrolmeasures(s.getDescriptionofcontrolmeasures());
             apsHazardInvestigationTemplateZibiaoDo.setClassificationofcontrolmeasures3(s.getClassificationofcontrolmeasures3());
-            subSaveList.add(apsHazardInvestigationTemplateZibiaoDo);
+            apsHazardInvestigationTemplateZibiaoDo.setTenantid(apsDetailsHazardInvestigationTasksDo.getTenantid());
+        subSaveList.add(apsHazardInvestigationTemplateZibiaoDo);
         }
         return subSaveList;
     }