Merge remote-tracking branch 'origin/master'

emall-admin-api/src/main/java/com/emall/flash/api/controller/system/RoleController.java

@@ -81,14 +81,18 @@ public class RoleController extends BaseController {
             if (record.getTenantId()!=null) {
                 Tenant tenant = tenantService.get(record.getTenantId());
                 record.setTenantName(tenant.getName());
+                if (record.getPid()!=null) {
                     Role role = roleService.get(record.getPid());
-                if (role!=null)
+                    if (role != null)
                         record.setPidName(role.getName());
+                }
+                if (record.getDeptid()!=null) {
                     Dept dept = deptService.get(record.getDeptid());
-                if (dept!=null)
+                    if (dept != null)
                         record.setDeptName(dept.getFullname());
                 }
             }
+        }
         return Rets.success(page);
     }