Pre Merge pull request !422 from root/N/A

2025-12-02 05:14:08 +00:00
7 changed files with 35 additions and 55 deletions
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
@ -147,12 +147,12 @@ public class ExcelUtil<T>
    /**
     * 对象的子列表方法
     */
-    private Map<String, Method> subMethods = new HashMap<>();
+    private Method subMethod;

    /**
     * 对象的子列表属性
     */
-    private Map<String, List<Field>> subFieldsMap = new HashMap<>();
+    private List<Field> subFields;

    /**
     * 统计列表
@ -225,7 +225,7 @@ public class ExcelUtil<T>
            int titleLastCol = this.fields.size() - 1;
            if (isSubList())
            {
-                titleLastCol = titleLastCol + subFieldsMap.values().size() - 1;
+                titleLastCol = titleLastCol + subFields.size() - 1;
            }
            Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
            titleRow.setHeightInPoints(30);
@ -245,17 +245,16 @@ public class ExcelUtil<T>
        {
            Row subRow = sheet.createRow(rownum);
            int column = 0;
+            int subFieldSize = subFields != null ? subFields.size() : 0;
            for (Object[] objects : fields)
            {
                Field field = (Field) objects[0];
                Excel attr = (Excel) objects[1];
-                CellStyle cellStyle = styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()));
                if (Collection.class.isAssignableFrom(field.getType()))
                {
                    Cell cell = subRow.createCell(column);
                    cell.setCellValue(attr.name());
-                    cell.setCellStyle(cellStyle);
-                    int subFieldSize = subFieldsMap != null ? subFieldsMap.get(field.getName()).size() : 0;
+                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
                    if (subFieldSize > 1)
                    {
                        CellRangeAddress cellAddress = new CellRangeAddress(rownum, rownum, column, column + subFieldSize - 1);
@ -267,7 +266,7 @@ public class ExcelUtil<T>
                {
                    Cell cell = subRow.createCell(column++);
                    cell.setCellValue(attr.name());
-                    cell.setCellStyle(cellStyle);
+                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
                }
            }
            rownum++;
@ -339,11 +338,7 @@ public class ExcelUtil<T>
            Map<String, Integer> cellMap = new HashMap<String, Integer>();
            // 获取表头
            Row heard = sheet.getRow(titleNum);
-            if (heard == null)
-            {
-                throw new UtilException("文件标题行为空，请检查Excel文件格式");
-            }
-            for (int i = 0; i < heard.getLastCellNum(); i++)
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
            {
                Cell cell = heard.getCell(i);
                if (StringUtils.isNotNull(cell))
@ -351,6 +346,10 @@ public class ExcelUtil<T>
                    String value = this.getCellValue(heard, i).toString();
                    cellMap.put(value, i);
                }
+                else
+                {
+                    cellMap.put(null, i);
+                }
            }
            // 有数据时才处理 得到类的所有field.
            List<Object[]> fields = this.getFields();
@ -563,8 +562,7 @@ public class ExcelUtil<T>
                Excel excel = (Excel) os[1];
                if (Collection.class.isAssignableFrom(field.getType()))
                {
-                    List<Field> currentSubFields = subFieldsMap.get(field.getName());
-                    for (Field subField : currentSubFields)
+                    for (Field subField : subFields)
                    {
                        Excel subExcel = subField.getAnnotation(Excel.class);
                        this.createHeadCell(subExcel, row, column++);
@ -577,7 +575,7 @@ public class ExcelUtil<T>
            }
            if (Type.EXPORT.equals(type))
            {
-                fillExcelData(index);
+                fillExcelData(index, row);
                addStatisticsRow();
            }
        }
@ -590,7 +588,7 @@ public class ExcelUtil<T>
     * @param row 单元格行
     */
    @SuppressWarnings("unchecked")
-    public void fillExcelData(int index)
+    public void fillExcelData(int index, Row row)
    {
        int startNo = index * sheetSize;
        int endNo = Math.min(startNo + sheetSize, list.size());
@ -598,7 +596,7 @@ public class ExcelUtil<T>

        for (int i = startNo; i < endNo; i++)
        {
-            Row row = sheet.createRow(currentRowNum);
+            row = sheet.createRow(currentRowNum);
            T vo = (T) list.get(i);
            int column = 0;
            int maxSubListSize = getCurrentMaxSubListSize(vo);
@ -614,7 +612,6 @@ public class ExcelUtil<T>
                        if (subList != null && !subList.isEmpty())
                        {
                            int subIndex = 0;
-                            List<Field> currentSubFields = subFieldsMap.get(field.getName());
                            for (Object subVo : subList)
                            {
                                Row subRow = sheet.getRow(currentRowNum + subIndex);
@ -624,14 +621,14 @@ public class ExcelUtil<T>
                                }

                                int subColumn = column;
-                                for (Field subField : currentSubFields)
+                                for (Field subField : subFields)
                                {
                                    Excel subExcel = subField.getAnnotation(Excel.class);
                                    addCell(subExcel, subRow, (T) subVo, subField, subColumn++);
                                }
                                subIndex++;
                            }
-                            column += currentSubFields.size();
+                            column += subFields.size();
                        }
                    }
                    catch (Exception e)
@ -986,7 +983,7 @@ public class ExcelUtil<T>
            {
                // 创建cell
                cell = row.createCell(column);
-                if (isSubListValue(vo) && getListCellValue(vo) > 1 && attr.needMerge())
+                if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
                {
                    if (subMergedLastRowNum >= subMergedFirstRowNum)
                    {
@ -1397,11 +1394,10 @@ public class ExcelUtil<T>
            }
            if (Collection.class.isAssignableFrom(field.getType()))
            {
-                String fieldName = field.getName();
-                subMethods.put(fieldName, getSubMethod(fieldName, clazz));
+                subMethod = getSubMethod(field.getName(), clazz);
                ParameterizedType pt = (ParameterizedType) field.getGenericType();
                Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
-                subFieldsMap.put(fieldName, FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class));
+                this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
            }
        }

@ -1596,7 +1592,7 @@ public class ExcelUtil<T>
     */
    public boolean isSubList()
    {
-        return !StringUtils.isEmpty(subFieldsMap);
+        return StringUtils.isNotNull(subFields) && subFields.size() > 0;
    }

    /**
@ -1604,32 +1600,24 @@ public class ExcelUtil<T>
     */
    public boolean isSubListValue(T vo)
    {
-        return !StringUtils.isEmpty(subFieldsMap) && getListCellValue(vo) > 0;
+        return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0;
    }

    /**
     * 获取集合的值
     */
-    public int getListCellValue(Object obj)
+    public Collection<?> getListCellValue(Object obj)
    {
-        Collection<?> value;
-        int max = 0;
+        Object value;
        try
        {
-            for (String s : subMethods.keySet())
-            {
-                value = (Collection<?>) subMethods.get(s).invoke(obj);
-                if (value.size() > max)
-                {
-                    max = value.size();
-                }
-            }
+            value = subMethod.invoke(obj, new Object[] {});
        }
        catch (Exception e)
        {
-            return 0;
+            return new ArrayList<Object>();
        }
-        return max;
+        return (Collection<?>) value;
    }

    /**
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm
@ -334,7 +334,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}.value && '' != daterange${AttrName}.value) {
+  if (null != daterange${AttrName} && '' != daterange${AttrName}) {
    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
  }
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/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}.value && '' != daterange${AttrName}.value) {
+  if (null != daterange${AttrName} && '' != daterange${AttrName}) {
    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
  }
--- a/ruoyi-ui/src/store/modules/settings.js
+++ b/ruoyi-ui/src/store/modules/settings.js
@ -23,9 +23,6 @@ const mutations = {
    if (state.hasOwnProperty(key)) {
      state[key] = value
    }
-  },
-  SET_TITLE: (state, title) => {
-    state.title = title
  }
 }

@ -36,7 +33,7 @@ const actions = {
  },
  // 设置网页标题
  setTitle({ commit }, title) {
-    commit('SET_TITLE', title)
+    state.title = title
    useDynamicTitle()
  }
 }
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@ -56,7 +56,7 @@
    </el-form>
    <!--  底部  -->
    <div class="el-login-footer">
-      <span>{{ footerContent }}</span>
+      <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
    </div>
  </div>
 </template>
@ -65,14 +65,12 @@
 import { getCodeImg } from "@/api/login"
 import Cookies from "js-cookie"
 import { encrypt, decrypt } from '@/utils/jsencrypt'
-import defaultSettings from '@/settings'

 export default {
  name: "Login",
  data() {
    return {
      title: process.env.VUE_APP_TITLE,
-      footerContent: defaultSettings.footerContent,
      codeUrl: "",
      loginForm: {
        username: "admin",
@ -158,7 +156,7 @@ export default {
 }
 </script>

-<style rel="stylesheet/scss" lang="scss" scoped>
+<style rel="stylesheet/scss" lang="scss">
 .login {
  display: flex;
  justify-content: center;
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@ -61,14 +61,13 @@
    </el-form>
    <!--  底部  -->
    <div class="el-register-footer">
-      <span>{{ footerContent }}</span>
+      <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>
    </div>
  </div>
 </template>

 <script>
 import { getCodeImg, register } from "@/api/login"
-import defaultSettings from '@/settings'

 export default {
  name: "Register",
@ -82,7 +81,6 @@ export default {
    }
    return {
      title: process.env.VUE_APP_TITLE,
-      footerContent: defaultSettings.footerContent,
      codeUrl: "",
      registerForm: {
        username: "",
@ -149,7 +147,7 @@ export default {
 }
 </script>

-<style rel="stylesheet/scss" lang="scss" scoped>
+<style rel="stylesheet/scss" lang="scss">
 .register {
  display: flex;
  justify-content: center;
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@ -253,8 +253,7 @@ export default {
          this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath)
        })
      } else {
-        const zipName = Array.isArray(tableNames) ? "ruoyi.zip" : tableNames + ".zip"
-        this.$download.zip("/code/gen/batchGenCode?tables=" + tableNames, zipName)
+        this.$download.zip("/code/gen/batchGenCode?tables=" + tableNames, "ruoyi.zip")
      }
    },
    /** 同步数据库操作 */