Merge branch 'master' of http://192.168.0.204/pd-new/pd-user

src/main/java/com/pangding/web/authority/service/impl/RoleServiceImpl.java

@@ -209,15 +209,7 @@ public class RoleServiceImpl implements RoleService {
         roleGetReqVo.setId(roleVo.getId());
         List<RoleVo> childList = roleDao.getChild(roleGetReqVo);
         for (RoleVo child:childList) {
-            roleDao.remove(child);
-            RoleAuthorityGetReqVo reqVo1 = new RoleAuthorityGetReqVo();
-            reqVo1.setRoleId(child.getId());
-            List<RoleAuthorityVo> roleAuthorityList2 = roleAuthorityDaoImpl.getRoleAuthorityList(reqVo1);
-            if (roleAuthorityList2 != null && roleAuthorityList2.size() != 0){
-                for (RoleAuthorityVo roleAuthority:roleAuthorityList) {
-                    roleAuthorityDaoImpl.remove(roleAuthority);
-                }
-            }
+            this.deleteRole(child);
         }
     }