diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java index 4530011..cceab3f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java @@ -57,7 +57,7 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O addDept("儿科", obj); addDept("妇产科", obj); // 新建机构时,新建6个角色:院内统计87、产科产房4、儿科医生46、院办管理63、孕产妇医生48、主任-产科66 -// addDefaultRoles(obj); + addDefaultRoles(obj); return obj.getId(); } @@ -91,23 +91,23 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O rolesList.add(rolesService.getRoles(48)); rolesList.add(rolesService.getRoles(66)); for (Roles roles:rolesList) { - RolePermissionMapsQuery mapsQuery = new RolePermissionMapsQuery(); - mapsQuery.setYn(YnEnums.YES.getId()); - mapsQuery.setRoleId(roles.getId()); - List mapsList = rolePermissionMapsService.queryRolePermissionMaps(mapsQuery); +// RolePermissionMapsQuery mapsQuery = new RolePermissionMapsQuery(); +// mapsQuery.setYn(YnEnums.YES.getId()); +// mapsQuery.setRoleId(roles.getId()); +// List mapsList = rolePermissionMapsService.queryRolePermissionMaps(mapsQuery); roles.setId(null); roles.setPublishName(obj.getPublishName()); roles.setPublishId(obj.getPublishId()); roles.setOrgId(obj.getId()); roles.setModified(new Date()); roles.setCreated(roles.getModified()); - roles.setRemarks(obj.getName()+"_"+mapsQuery.getRoleId()); + roles.setRemarks(obj.getName()); rolesService.addRoles(roles); - for (RolePermissionMaps maps:mapsList) { - maps.setId(null); - maps.setRoleId(roles.getId()); - rolePermissionMapsService.addRolePermissionMaps(maps); - } +// for (RolePermissionMaps maps:mapsList) { +// maps.setId(null); +// maps.setRoleId(roles.getId()); +// rolePermissionMapsService.addRolePermissionMaps(maps); +// } } }