Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

935090232@qq.com

2021-05-08 6924e965ea3da70823f50f7285b50efab7205415

 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,11 +366,14 @@
         } else {
            // 非一级节点找到父节点后存入
            SysFunction parentFn = allFnMap.get(String.valueOf(function.getFnParentId()));
            List<SysFunction> childs = parentFn.getChilds();
            if (childs == null) {
               parentFn.setChilds(new ArrayList<SysFunction>());
            if(parentFn!=null){
               List<SysFunction> childs = parentFn.getChilds();
               if (childs == null) {
                  parentFn.setChilds(new ArrayList<SysFunction>());
               }
               parentFn.getChilds().add(function);
            }
            parentFn.getChilds().add(function);

         }

      }