Merge remote-tracking branch 'origin/master'

purchase-system/src/main/java/com/ozs/base/service/impl/BaseProfessionalServiceImpl.java

@@ -20,15 +20,7 @@ public class BaseProfessionalServiceImpl extends ServiceImpl<BaseProfessionalMap
     public List<BaseProfessional> selectBaseProfessional(BaseProfessional baseProfessional) {
         List<BaseProfessional> allList = baseProfessionalMapper.selectBaseProfessional(baseProfessional);
         List<BaseProfessional> treeList = buildTree(allList);
-//        for (BaseProfessional baseProfessional1 : oneGrade) {
-//            if (baseProfessional1.getParentCode().length() == 1) {
-//                baseProfessionalVoList.add(findChildren(sysMenu, sysMenuList));
-//            }
-//        }
-        //baseProfessionalMapper.selectListByGradeCode(baseProfessional);
-
-
-        return allList;
+        return treeList;
     }
 
     /**
@@ -41,7 +33,7 @@ public class BaseProfessionalServiceImpl extends ServiceImpl<BaseProfessionalMap
         //遍历所有菜单集合
         for (BaseProfessional baseProfessional : allList) {
             //找到递归入口，parentId=0
-            if (baseProfessional.getParentCode().length() == 1) {
+            if (baseProfessional.getParentCode().equals("0")) {
                 trees.add(findChildren(baseProfessional, allList));
             }
         }

purchase-system/src/main/resources/mapper/base/BaseProfessionalMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ozs.system.mapper.BaseProfessional">
+<mapper namespace="com.ozs.base.mapper.BaseProfessionalMapper">
 
     <resultMap type="com.ozs.base.domain.BaseProfessional" id="BaseProfessionalResult">
         <id property="id" column="id"/>