fix:调试代码

project-user/src/main/java/com/dituhui/pea/user/service/RoleService.java

@@ -68,21 +68,28 @@ public class RoleService {
 
     @Transactional
     public RoleInfo addRole(RoleInfo roleInfo) {
-        RoleEntity roleEntity = assembleRole(roleInfo);
-        roleEntity.setId(UUIDUtil.getUuid());
+        String name = roleInfo.getName();
+        String createdBy = roleInfo.getCreatedBy();
+        String notes = roleInfo.getNotes();
+        RoleEntity roleEntity = new RoleEntity();
+        roleEntity.setName(name);
+        roleEntity.setCreatedBy(createdBy);
+        roleEntity.setCreatedTime(new Date());
+        roleEntity.setNotes(notes);
+        // RoleEntity roleEntity = assembleRole(roleInfo);
         log.info("新增角色入参：" + JSONObject.toJSONString(roleEntity));
         roleEntity = roleDao.save(roleEntity);
         // roleInfo = BeanUtil.copyProperties(roleEntity, RoleInfo.class);
-        // roleInfo.setId(roleEntity.getId());
-        // List<RoleResourceInfo> resourceInfos = roleInfo.getResourceInfos();
-        // if (CollectionUtils.isNotEmpty(resourceInfos)) {
-        //     for (RoleResourceInfo resourceInfo : resourceInfos) {
-        //         RoleResourceEntity roleResourceEntity = assembleRoleResource(roleInfo.getId(), resourceInfo.getResourceId());
-        //         roleResourceDao.save(roleResourceEntity);
-        //     }
-        // }
+        roleInfo.setId(roleEntity.getId());
+        List<RoleResourceInfo> resourceInfos = roleInfo.getResourceInfos();
+        if (CollectionUtils.isNotEmpty(resourceInfos)) {
+            for (RoleResourceInfo resourceInfo : resourceInfos) {
+                RoleResourceEntity roleResourceEntity = assembleRoleResource(roleInfo.getId(), resourceInfo.getResourceId());
+                roleResourceDao.save(roleResourceEntity);
+            }
+        }
         log.info("新增角色信息：" + JSONObject.toJSONString(roleInfo));
-        return null;
+        return roleInfo;
     }