diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 116f6c544..698a89552 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -69,6 +69,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     {
 #foreach ($column in $columns)
 #if($column.javaField == 'createTime')
+        ${className}.setCreateBy(SecurityUtils.getUsername());
         ${className}.setCreateTime(DateUtils.getNowDate());
 #end
 #end
@@ -95,6 +96,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
     {
 #foreach ($column in $columns)
 #if($column.javaField == 'updateTime')
+        ${className}.setUpdateBy(SecurityUtils.getUsername());
         ${className}.setUpdateTime(DateUtils.getNowDate());
 #end
 #end
diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
index 936b4651f..1a9c51797 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
@@ -415,7 +415,7 @@ function getList() {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  if (null != daterange${AttrName} && '' != daterange${AttrName}) {
+  if (null != daterange${AttrName}.value && '' != daterange${AttrName}.value) {
     queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
     queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
   }