Merge remote-tracking branch 'origin/master'

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

@@ -123,6 +123,9 @@ public class MaintenanceServiceImpl implements MaintenanceService {
     public R batchSavePlans(BatchCreateDTO batchCreate) {
         //该设备分类下的所以部位保养标准
         List<EquMaintenanceStandardDo> partsSetoutStandardList = maintenanceStandardService.getPlanTypeByList(batchCreate.getPlanType());
+        if(partsSetoutStandardList.size()==0){
+            return R.error(EquipmentTypeEnum.typeOf(Integer.parseInt(batchCreate.getPlanType()))+"没有储存标准！");
+        }
         //明细表数组
         List<EquMaintenancePartDo> equMaintenancePartList = new ArrayList<>();
 
@@ -519,7 +522,7 @@ public class MaintenanceServiceImpl implements MaintenanceService {
     public EquMaintenanceScheduleDo dataShiftFacilityToPlan(AspCheckItems aspCheckItem,Integer year){
         EquMaintenanceScheduleDo maintenanceSchedule = new EquMaintenanceScheduleDo();
         Date newDate = new Date();
-        SysUserVo currentUser = CommonUtils.getCurrentUser();
+        // SysUserVo currentUser = CommonUtils.getCurrentUser();
         maintenanceSchedule.setEquipmenttype(aspCheckItem.getDevicesort())
                 .setPlanyear(year)
                 .setEquipmentname(aspCheckItem.getCheckitemname())
@@ -534,11 +537,11 @@ public class MaintenanceServiceImpl implements MaintenanceService {
                 .setPlannedstatus("unlocked")
                 .setId(SecurityUtil.getUUID())
                 .setCreatedate(newDate)
-                .setCreateuserid(currentUser.getId())
-                .setCreateusername(currentUser.getName())
+                // .setCreateuserid(currentUser.getId())
+                // .setCreateusername(currentUser.getName())
                 .setModifydate(newDate)
-                .setModifyuserid(currentUser.getId())
-                .setModifyusername(currentUser.getName())
+                // .setModifyuserid(currentUser.getId())
+                // .setModifyusername(currentUser.getName())
                 .setTenantid(aspCheckItem.getTenantid());
         return maintenanceSchedule;
     }