Merge branch 'refs/heads/main' into dev-290

Author: piexlMax(奇淼

server/router/system/sys_export_template.go

@@ -17,7 +17,7 @@ func (s *SysExportTemplateRouter) InitSysExportTemplateRouter(Router *gin.Router
 		sysExportTemplateRouter.DELETE("deleteSysExportTemplate", exportTemplateApi.DeleteSysExportTemplate)           // 删除导出模板
 		sysExportTemplateRouter.DELETE("deleteSysExportTemplateByIds", exportTemplateApi.DeleteSysExportTemplateByIds) // 批量删除导出模板
 		sysExportTemplateRouter.PUT("updateSysExportTemplate", exportTemplateApi.UpdateSysExportTemplate)              // 更新导出模板
-		sysExportTemplateRouter.POST("importExcel", exportTemplateApi.ImportExcel)                                     // 更新导出模板
+		sysExportTemplateRouter.POST("importExcel", exportTemplateApi.ImportExcel)                                     // 导入excel模板数据
 	}
 	{
 		sysExportTemplateRouterWithoutRecord.GET("findSysExportTemplate", exportTemplateApi.FindSysExportTemplate)       // 根据ID获取导出模板

server/service/system/sys_auto_code_mssql.go

@@ -15,7 +15,7 @@ type autoCodeMssql struct{}
 // Author [SliverHorn](https://github.com/SliverHorn)
 func (s *autoCodeMssql) GetDB(businessDB string) (data []response.Db, err error) {
 	var entities []response.Db
-	sql := "select name AS 'database' from sysdatabases;"
+	sql := "select name AS 'database' from sys.databases;"
 	if businessDB == "" {
 		err = global.GVA_DB.Raw(sql).Scan(&entities).Error
 	} else {

web/src/components/selectImage/selectImage.vue

@@ -5,7 +5,7 @@
       <selectComponent :rounded="rounded" v-for="(item, index) in model" :key="index" :model="item" @chooseItem="openChooseImg"
                        @deleteItem="deleteImg(index)"
       />
-      <selectComponent :rounded="rounded" v-if="model.length < props.maxUpdateCount || props.maxUpdateCount === 0"
+      <selectComponent :rounded="rounded" v-if="model?.length < props.maxUpdateCount || props.maxUpdateCount === 0"
                        @chooseItem="openChooseImg" @deleteItem="openChooseImg"
       />
     </div>

web/src/pinia/modules/user.js

@@ -28,7 +28,7 @@ export const useUserStore = defineStore('user', () => {
     userInfo.value = val
     if (val.originSetting) {
       Object.keys(appStore.config).forEach((key) => {
-        if (val.originSetting[key]) {
+        if (val.originSetting[key] !== undefined) {
           appStore.config[key] = val.originSetting[key]
         }
       })