添加角色列表加字段

5ddabadf · gaoyingwei · 864c7391 · 5ddabadf
Commit 5ddabadf authored Jul 17, 2023 by gaoyingwei
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

RoleController.java ...com/emall/flash/api/controller/system/RoleController.java +10 -6

No files found.
--- a/emall-admin-api/src/main/java/com/emall/flash/api/controller/system/RoleController.java
+++ b/emall-admin-api/src/main/java/com/emall/flash/api/controller/system/RoleController.java
@@ -81,12 +81,16 @@ public class RoleController extends BaseController {
            if (record.getTenantId()!=null) {
                Tenant tenant = tenantService.get(record.getTenantId());
                record.setTenantName(tenant.getName());
-                Role role = roleService.get(record.getPid());
+                if (record.getPid()!=null) {
-                if (role!=null)
+                    Role role = roleService.get(record.getPid());
-                    record.setPidName(role.getName());
+                    if (role != null)
-                Dept dept = deptService.get(record.getDeptid());
+                        record.setPidName(role.getName());
-                if (dept!=null)
+                }
-                    record.setDeptName(dept.getFullname());
+                if (record.getDeptid()!=null) {
+                    Dept dept = deptService.get(record.getDeptid());
+                    if (dept != null)
+                        record.setDeptName(dept.getFullname());
+                }
            }
        }
        return Rets.success(page);