设备之系统——保养检修 BUG

修复生成的工厂ID

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/config/EquMaintenanceStandardListener.java

@@ -83,7 +83,7 @@ public class EquMaintenanceStandardListener extends AnalysisEventListener<EquMai
                 .setCreatedate(date)
                 .setModifydate(date)
                 .setId(SecurityUtil.getUUID())
-                .setTenantid(currentUser.getTenantid())
+                .setTenantid(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1])
                 //                .setTenantid("0001S31000000000J0TR")
                 .setCreateusername(currentUser.getName())
                 .setCreateuserid(currentUser.getId())

cx-equipment/cx-equipment-common/src/main/java/com/rongwei/bscommon/sys/service/impl/MaintenanceServiceImpl.java

@@ -420,7 +420,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
             SysSerialVo sysSerialVo = new SysSerialVo();
             sysSerialVo.setModulecode("equ_maintenance_standard_aq_code_BC");
             sysSerialVo.setResetrule("date:yyyy");
-            sysSerialVo.setRuleTemplateStr(PlantEnum.addrOf(currentUser.getTenantid())+"-"+maintenanceSchedule.getPlantype()+"-@{date:yyyyMM}@{serialNumber:#00000}");
+            sysSerialVo.setRuleTemplateStr(PlantEnum.addrOf(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1])+"-"+maintenanceSchedule.getPlantype()+"-@{date:yyyyMM}@{serialNumber:#00000}");
             R serialNumberCode = rwAdminFeign.getSerialNumberCode(sysSerialVo);
             EquMaintenanceTaskDo equMaintenanceTask = new EquMaintenanceTaskDo();
             BeanUtils.copyProperties( maintenanceSchedule,equMaintenanceTask);
@@ -433,7 +433,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                     .setModifyuserid(currentUser.getId())
                     .setModifyusername(currentUser.getName())
                     .setModifydate(newDate)
-                    .setTenantid(currentUser.getTenantid());
+                    .setTenantid(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
             if ("200".equals(serialNumberCode.getCode())){
 
                 Object data = serialNumberCode.getData();
@@ -476,8 +476,8 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                             .setCreatedate(newDate)
                             .setModifyuserid(currentUser.getId())
                             .setModifyusername(currentUser.getName())
-                            .setModifydate(newDate);
-                    // .setTenantid(currentUser.getTenantid());
+                            .setModifydate(newDate)
+                    .setTenantid(currentUser.getOrganizationDoList().get(0).getFullpid().split(",")[1]);
                     return equPartsSetoutTaskDo;
                 }).collect(Collectors.toList())).flatMap(Collection::stream).distinct().collect(Collectors.toList());
     }