Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 zq-erp/src/main/java/com/matrix/system/common/service/impl/SysFunctionServiceImpl.java

@@ -4,6 +4,7 @@
import com.matrix.core.constance.SystemErrorCode;
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.PaginationVO;
import com.matrix.core.tools.LogUtil;
import com.matrix.core.tools.ModelUtils;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.authority.DefaultAuthorityManager;
@@ -365,6 +366,7 @@
         } else {
            // 非一级节点找到父节点后存入
            SysFunction parentFn = allFnMap.get(String.valueOf(function.getFnParentId()));
            if(parentFn!=null){
            List<SysFunction> childs = parentFn.getChilds();
            if (childs == null) {
               parentFn.setChilds(new ArrayList<SysFunction>());
@@ -373,6 +375,8 @@
         }

      }

      }
      return treeFunction;
   }