Merge branch 'master' of http://1.13.177.47:3000/Yangwl/SZXBGJ_HT

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BizMaintenanceOrderServiceImpl.java

@@ -60,7 +60,10 @@ public class BizMaintenanceOrderServiceImpl implements IBizMaintenanceOrderServi
     public int insertBizMaintenanceOrder(BizMaintenanceOrder bizMaintenanceOrder)
     {
         bizMaintenanceOrder.setCreateTime(DateUtils.getNowDate());
+        String createBy = bizMaintenanceOrder.getCreateBy();
+        if(createBy ==null || createBy.isEmpty()) {
             bizMaintenanceOrder.setCreateBy(getLoginName());
+        }
         return bizMaintenanceOrderMapper.insertBizMaintenanceOrder(bizMaintenanceOrder);
     }