Commit 89f399623971780ead7662aafca4b02b69577b88
1 parent
df52fb90a1
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 11 additions and 11 deletions
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
View file @
89f3996
| ... | ... | @@ -57,7 +57,7 @@ |
| 57 | 57 | addDept("儿科", obj); |
| 58 | 58 | addDept("妇产科", obj); |
| 59 | 59 | // 新建机构时，新建6个角色：院内统计87、产科产房4、儿科医生46、院办管理63、孕产妇医生48、主任-产科66 |
| 60 | -// addDefaultRoles(obj); | |
| 60 | + addDefaultRoles(obj); | |
| 61 | 61 | return obj.getId(); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | |
| 65 | 65 | |
| ... | ... | @@ -91,23 +91,23 @@ |
| 91 | 91 | rolesList.add(rolesService.getRoles(48)); |
| 92 | 92 | rolesList.add(rolesService.getRoles(66)); |
| 93 | 93 | for (Roles roles:rolesList) { |
| 94 | - RolePermissionMapsQuery mapsQuery = new RolePermissionMapsQuery(); | |
| 95 | - mapsQuery.setYn(YnEnums.YES.getId()); | |
| 96 | - mapsQuery.setRoleId(roles.getId()); | |
| 97 | - List<RolePermissionMaps> mapsList = rolePermissionMapsService.queryRolePermissionMaps(mapsQuery); | |
| 94 | +// RolePermissionMapsQuery mapsQuery = new RolePermissionMapsQuery(); | |
| 95 | +// mapsQuery.setYn(YnEnums.YES.getId()); | |
| 96 | +// mapsQuery.setRoleId(roles.getId()); | |
| 97 | +// List<RolePermissionMaps> mapsList = rolePermissionMapsService.queryRolePermissionMaps(mapsQuery); | |
| 98 | 98 | roles.setId(null); |
| 99 | 99 | roles.setPublishName(obj.getPublishName()); |
| 100 | 100 | roles.setPublishId(obj.getPublishId()); |
| 101 | 101 | roles.setOrgId(obj.getId()); |
| 102 | 102 | roles.setModified(new Date()); |
| 103 | 103 | roles.setCreated(roles.getModified()); |
| 104 | - roles.setRemarks(obj.getName()+"_"+mapsQuery.getRoleId()); | |
| 104 | + roles.setRemarks(obj.getName()); | |
| 105 | 105 | rolesService.addRoles(roles); |
| 106 | - for (RolePermissionMaps maps:mapsList) { | |
| 107 | - maps.setId(null); | |
| 108 | - maps.setRoleId(roles.getId()); | |
| 109 | - rolePermissionMapsService.addRolePermissionMaps(maps); | |
| 110 | - } | |
| 106 | +// for (RolePermissionMaps maps:mapsList) { | |
| 107 | +// maps.setId(null); | |
| 108 | +// maps.setRoleId(roles.getId()); | |
| 109 | +// rolePermissionMapsService.addRolePermissionMaps(maps); | |
| 110 | +// } | |
| 111 | 111 | } |
| 112 | 112 | } |
| 113 | 113 |